Fixes #13 fix script documentation

[jirafeau.git] / script.php

diff --git a/script.php b/script.php
old mode 100755 (executable)
new mode 100644 (file)
index b6fa71f..bb44562
--- a/script.php
+++ b/script.php
@@ -43,7 +43,7 @@ require (JIRAFEAU_ROOT . 'lib/lang.php');
 if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)\r
 {\r
     require (JIRAFEAU_ROOT . 'lib/template/header.php');\r
-    check_errors ();\r
+    check_errors ($cfg);\r
     if (has_error ())\r
     {\r
         show_errors ();\r
@@ -92,6 +92,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo "<b>time=</b>[minute|hour|day|week|month|none]<i> (" . t('Optional') . ', '. t('default: none') . ")</i> <br />";\r
     echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />";\r
     echo "<b>one_time_download=</b>1<i> (" . t('Optional') . ")</i> <br />";\r
+    echo "<b>upload_password=</b>your_upload_password<i> (" . t('Optional') . ")</i> <br />";\r
     echo '</p>';\r
     echo '<p>' . t('This will return brut text content.') . ' ' .\r
          t('First line is the download reference and the second line the delete code.') . '<br /></p>';\r
@@ -143,7 +144,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
         echo "$name: <a href=\"" . $web_root . "script.php?lang=$lang\">" . $web_root . "script.php?lang=$lang</a> ";\r
     echo '</p>';\r
     \r
-    echo '<h3>' . t('Initalize a asynchronous transfert') . ':</h3>';\r
+    echo '<h3>' . t('Initalize an asynchronous transfert') . ':</h3>';\r
     echo '<p>';\r
     echo t('The goal is to permit to transfert big file, chunk by chunk.') . ' ';\r
     echo t('Chunks of data must be sent in order.');\r
@@ -157,6 +158,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo "<b>time=</b>[minute|hour|day|week|month|none]<i> (" . t('Optional') . ', '. t('default: none') . ")</i> <br />";\r
     echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />";\r
     echo "<b>one_time_download=</b>1<i> (" . t('Optional') . ")</i> <br />";\r
+    echo "<b>upload_password=</b>your_upload_password<i> (" . t('Optional') . ")</i> <br />";\r
     echo '</p>';\r
     echo '<p>' . t('This will return brut text content.') . ' ' .\r
          t('First line is the asynchronous transfert reference and the second line the code to use in the next operation.') . '<br /></p>';\r
@@ -184,66 +186,6 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     echo '<p>' . t('This will return brut text content.') . ' ' .\r
          t('First line is the download reference and the second line the delete code.') . '<br /></p>';\r
 \r
-    if ($cfg['enable_blocks'])\r
-    {\r
-        echo '<h3>' . t('Create a data block') . ':</h3>';\r
-        echo '<p>';\r
-        echo t('This interface permits to create a block of data filled with zeros.') .\r
-            ' ' . t('You can read selected parts, write (using a code) and delete the block.') .\r
-            ' ' . t('Blocks may be removed after a month of non usage.');\r
-        echo '</p>';\r
-        echo '<p>';\r
-        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?init_block</i><br />';\r
-        echo '<br />';\r
-        echo t('Parameters') . ':<br />';\r
-        echo "<b>size=</b>size_in_bytes<i> (" . t('Required') . ")</i> <br />";\r
-        echo '</p>';\r
-        echo '<p>' . t('This will return brut text content.') . ' ' .\r
-             t('First line is a block id the second line the edit/delete code.') . '<br /></p>';\r
-\r
-        echo '<h3>' . t('Get block size') . ':</h3>';\r
-        echo '<p>';\r
-        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?get_block_size</i><br />';\r
-        echo '<br />';\r
-        echo t('Parameters') . ':<br />';\r
-        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";\r
-        echo '</p>';\r
-        echo '<p>' . t('This will return asked data or "Error" string.') . '<br /></p>';\r
-\r
-        echo '<h3>' . t('Read data in a block') . ':</h3>';\r
-        echo '<p>';\r
-        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?read_block</i><br />';\r
-        echo '<br />';\r
-        echo t('Parameters') . ':<br />';\r
-        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";\r
-        echo "<b>start=</b>byte_position_starting_from_zero<i> (" . t('Required') . ")</i> <br />";\r
-        echo "<b>length=</b>length_to_read_in_bytes<i> (" . t('Required') . ")</i> <br />";\r
-        echo '</p>';\r
-        echo '<p>' . t('This will return asked data or "Error" string.') . '<br /></p>';\r
-\r
-        echo '<h3>' . t('Write data in a block') . ':</h3>';\r
-        echo '<p>';\r
-        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?write_block</i><br />';\r
-        echo '<br />';\r
-        echo t('Parameters') . ':<br />';\r
-        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";\r
-        echo "<b>code=</b>block_code<i> (" . t('Required') . ")</i> <br />";\r
-        echo "<b>start=</b>byte_position_starting_from_zero<i> (" . t('Required') . ")</i> <br />";\r
-        echo "<b>data=</b>data_to_write<i> (" . t('Required') . ")</i> <br />";\r
-        echo '</p>';\r
-        echo '<p>' . t('This will return "Ok" or "Error" string.') . '<br /></p>';\r
-\r
-        echo '<h3>' . t('Delete a block') . ':</h3>';\r
-        echo '<p>';\r
-        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?delete_block</i><br />';\r
-        echo '<br />';\r
-        echo t('Parameters') . ':<br />';\r
-        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";\r
-        echo "<b>code=</b>block_code<i> (" . t('Required') . ")</i> <br />";\r
-        echo '</p>';\r
-        echo '<p>' . t('This will return "Ok" or "Error" string.') . '<br /></p>';\r
-    }\r
-\r
     echo '</div><br />';\r
     require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r
     exit;\r
@@ -252,7 +194,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
 /* Lets use interface now. */\r
 header('Content-Type: text; charset=utf-8');\r
 \r
-check_errors ();\r
+check_errors ($cfg);\r
 if (has_error ())\r
 {\r
     echo "Error";\r
@@ -263,6 +205,14 @@ if (has_error ())
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)\r
     && is_writable (VAR_LINKS))\r
 {\r
+    if (jirafeau_has_upload_password ($cfg) &&\r
+         (!isset ($_POST['upload_password']) ||\r
+          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))\r
+    {\r
+        echo "Error";\r
+        exit;\r
+    }\r
+\r
     $key = '';\r
     if (isset ($_POST['key']))\r
         $key = $_POST['key'];\r
@@ -523,6 +473,14 @@ fi
 /* Initialize an asynchronous upload. */\r
 elseif (isset ($_GET['init_async']))\r
 {\r
+    if (jirafeau_has_upload_password ($cfg) &&\r
+         (!isset ($_POST['upload_password']) ||\r
+          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))\r
+    {\r
+        echo "Error";\r
+        exit;\r
+    }\r
+\r
     if (!isset ($_POST['filename']))\r
     {\r
         echo "Error";\r
@@ -534,8 +492,8 @@ elseif (isset ($_GET['init_async']))
         $type = $_POST['type'];\r
     \r
     $key = '';\r
-    if (isset ($_POST['password']))\r
-        $key = $_POST['password'];\r
+    if (isset ($_POST['key']))\r
+        $key = $_POST['key'];\r
 \r
     $time = time ();\r
     if (!isset ($_POST['time']))\r
@@ -588,52 +546,6 @@ elseif (isset ($_GET['end_async']))
     else\r
         echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_lenght']);\r
 }\r
-/* Initialize block. */\r
-elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])\r
-{\r
-    if (!isset ($_POST['size']))\r
-        echo "Error";\r
-    else\r
-        echo jirafeau_block_init ($_POST['size']);\r
-}\r
-/* Get block size. */\r
-elseif (isset ($_GET['get_block_size']) && $cfg['enable_blocks'])\r
-{\r
-    if (!isset ($_POST['id']))\r
-        echo "Error";\r
-    else\r
-        echo jirafeau_block_get_size ($_POST['id']);\r
-}\r
-/* Read data in block. */\r
-elseif (isset ($_GET['read_block']) && $cfg['enable_blocks'])\r
-{\r
-    if (!isset ($_POST['id'])\r
-        || !isset ($_POST['start'])\r
-        || !isset ($_POST['length']))\r
-        echo "Error";\r
-    else\r
-        jirafeau_block_read ($_POST['id'], $_POST['start'], $_POST['length']);\r
-}\r
-/* Write data in block. */\r
-elseif (isset ($_GET['write_block']) && $cfg['enable_blocks'])\r
-{\r
-    if (!isset ($_POST['id'])\r
-        || !isset ($_POST['start'])\r
-        || !isset ($_FILES['data'])\r
-        || !isset ($_POST['code']))\r
-        echo "Error";\r
-    else\r
-        echo jirafeau_block_write ($_POST['id'], $_POST['start'], $_FILES['data'], $_POST['code']);\r
-}\r
-/* Delete block. */\r
-elseif (isset ($_GET['delete_block']) && $cfg['enable_blocks'])\r
-{\r
-    if (!isset ($_POST['id'])\r
-        || !isset ($_POST['code']))\r
-        echo "Error";\r
-    else\r
-        echo jirafeau_block_delete ($_POST['id'], $_POST['code']);\r
-}\r
 else\r
     echo "Error";\r
 exit;\r