X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/a995e194d8f5e997cfc1032389497a9f20b7d7e3..8ee528004ffcc1c82ee18ae95a8b3eba8b01bb00:/script.php?ds=sidebyside

diff --git a/script.php b/script.php
old mode 100755
new mode 100644
index 25548e6..3185de7
--- a/script.php
+++ b/script.php
@@ -25,7 +25,7 @@
 
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');
@@ -36,12 +36,14 @@ require (JIRAFEAU_ROOT . 'lib/lang.php');
 /* Operations may take a long time.
  * Be sure PHP's safe mode is off.
  */
- set_time_limit(0);
+@set_time_limit(0);
+/* Remove errors. */
+@error_reporting(0);
 
 if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
 {
     require (JIRAFEAU_ROOT . 'lib/template/header.php');
-    check_errors ();
+    check_errors ($cfg);
     if (has_error ())
     {
         show_errors ();
@@ -182,6 +184,66 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo '<p>' . t('This will return brut text content.') . ' ' .
          t('First line is the download reference and the second line the delete code.') . '<br /></p>';
 
+    if ($cfg['enable_blocks'])
+    {
+        echo '<h3>' . t('Create a data block') . ':</h3>';
+        echo '<p>';
+        echo t('This interface permits to create a block of data filled with zeros.') .
+            ' ' . t('You can read selected parts, write (using a code) and delete the block.') .
+            ' ' . t('Blocks may be removed after a month of non usage.');
+        echo '</p>';
+        echo '<p>';
+        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?init_block</i><br />';
+        echo '<br />';
+        echo t('Parameters') . ':<br />';
+        echo "<b>size=</b>size_in_bytes<i> (" . t('Required') . ")</i> <br />";
+        echo '</p>';
+        echo '<p>' . t('This will return brut text content.') . ' ' .
+             t('First line is a block id the second line the edit/delete code.') . '<br /></p>';
+
+        echo '<h3>' . t('Get block size') . ':</h3>';
+        echo '<p>';
+        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?get_block_size</i><br />';
+        echo '<br />';
+        echo t('Parameters') . ':<br />';
+        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";
+        echo '</p>';
+        echo '<p>' . t('This will return asked data or "Error" string.') . '<br /></p>';
+
+        echo '<h3>' . t('Read data in a block') . ':</h3>';
+        echo '<p>';
+        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?read_block</i><br />';
+        echo '<br />';
+        echo t('Parameters') . ':<br />';
+        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";
+        echo "<b>start=</b>byte_position_starting_from_zero<i> (" . t('Required') . ")</i> <br />";
+        echo "<b>length=</b>length_to_read_in_bytes<i> (" . t('Required') . ")</i> <br />";
+        echo '</p>';
+        echo '<p>' . t('This will return asked data or "Error" string.') . '<br /></p>';
+
+        echo '<h3>' . t('Write data in a block') . ':</h3>';
+        echo '<p>';
+        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?write_block</i><br />';
+        echo '<br />';
+        echo t('Parameters') . ':<br />';
+        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";
+        echo "<b>code=</b>block_code<i> (" . t('Required') . ")</i> <br />";
+        echo "<b>start=</b>byte_position_starting_from_zero<i> (" . t('Required') . ")</i> <br />";
+        echo "<b>data=</b>data_to_write<i> (" . t('Required') . ")</i> <br />";
+        echo '</p>';
+        echo '<p>' . t('This will return "Ok" or "Error" string.') . '<br /></p>';
+
+        echo '<h3>' . t('Delete a block') . ':</h3>';
+        echo '<p>';
+        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?delete_block</i><br />';
+        echo '<br />';
+        echo t('Parameters') . ':<br />';
+        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";
+        echo "<b>code=</b>block_code<i> (" . t('Required') . ")</i> <br />";
+        echo '</p>';
+        echo '<p>' . t('This will return "Ok" or "Error" string.') . '<br /></p>';
+    }
+
     echo '</div><br />';
     require (JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
@@ -190,10 +252,23 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
 /* Lets use interface now. */
 header('Content-Type: text; charset=utf-8');
 
+check_errors ($cfg);
+if (has_error ())
+{
+    echo "Error";
+    exit;
+}
+
 /* Upload file */
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     && is_writable (VAR_LINKS))
 {
+    if (strlen ($cfg['upload_password']) > 0 && (!isset ($_POST['upload_password']) || $_POST['upload_password'] != $cfg['upload_password']))
+    {
+        echo "Error";
+        exit;
+    }
+
     $key = '';
     if (isset ($_POST['key']))
         $key = $_POST['key'];
@@ -225,7 +300,8 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
         }
     $res = jirafeau_upload ($_FILES['file'],
                             isset ($_POST['one_time_download']),
-                            $key, $time, $_SERVER['REMOTE_ADDR']);
+                            $key, $time, $_SERVER['REMOTE_ADDR'],
+                            $cfg['enable_crypt'], $cfg['link_name_lenght']);
     
     if (empty($res) || $res['error']['has_error'])
     {
@@ -234,9 +310,12 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     }
     /* Print direct link. */
     echo $res['link'];
-    echo NL;
     /* Print delete link. */
+    echo NL;
     echo $res['delete_link'];
+    /* Print decrypt key. */
+    echo NL;
+    echo urlencode($res['crypt_key']);
 }
 elseif (isset ($_GET['h']))
 {
@@ -248,7 +327,7 @@ elseif (isset ($_GET['h']))
     if (isset ($_GET['d']))
         $d = $_GET['d'];
     
-    if (!preg_match ('/[0-9a-zA-Z_-]{22}$/', $link_name))
+    if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {
         echo "Error";
         exit;
@@ -450,6 +529,12 @@ fi
 /* Initialize an asynchronous upload. */
 elseif (isset ($_GET['init_async']))
 {
+    if (strlen ($cfg['upload_password']) > 0 && (!isset ($_POST['upload_password']) || $_POST['upload_password'] != $cfg['upload_password']))
+    {
+        echo "Error";
+        exit;
+    }
+
     if (!isset ($_POST['filename']))
     {
         echo "Error";
@@ -513,7 +598,59 @@ elseif (isset ($_GET['end_async']))
         || !isset ($_POST['code']))
         echo "Error";
     else
-        echo jirafeau_async_end ($_POST['ref'], $_POST['code']);
+        echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_lenght']);
+}
+/* Initialize block. */
+elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])
+{
+    if (strlen ($cfg['upload_password']) > 0 && (!isset ($_POST['upload_password']) || $_POST['upload_password'] != $cfg['upload_password']))
+    {
+        echo "Error";
+        exit;
+    }
+
+    if (!isset ($_POST['size']))
+        echo "Error";
+    else
+        echo jirafeau_block_init ($_POST['size']);
+}
+/* Get block size. */
+elseif (isset ($_GET['get_block_size']) && $cfg['enable_blocks'])
+{
+    if (!isset ($_POST['id']))
+        echo "Error";
+    else
+        echo jirafeau_block_get_size ($_POST['id']);
+}
+/* Read data in block. */
+elseif (isset ($_GET['read_block']) && $cfg['enable_blocks'])
+{
+    if (!isset ($_POST['id'])
+        || !isset ($_POST['start'])
+        || !isset ($_POST['length']))
+        echo "Error";
+    else
+        jirafeau_block_read ($_POST['id'], $_POST['start'], $_POST['length']);
+}
+/* Write data in block. */
+elseif (isset ($_GET['write_block']) && $cfg['enable_blocks'])
+{
+    if (!isset ($_POST['id'])
+        || !isset ($_POST['start'])
+        || !isset ($_FILES['data'])
+        || !isset ($_POST['code']))
+        echo "Error";
+    else
+        echo jirafeau_block_write ($_POST['id'], $_POST['start'], $_FILES['data'], $_POST['code']);
+}
+/* Delete block. */
+elseif (isset ($_GET['delete_block']) && $cfg['enable_blocks'])
+{
+    if (!isset ($_POST['id'])
+        || !isset ($_POST['code']))
+        echo "Error";
+    else
+        echo jirafeau_block_delete ($_POST['id'], $_POST['code']);
 }
 else
     echo "Error";