error_log when crypt extension is not loaded and more checks

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
old mode 100755 (executable)
new mode 100644 (file)
index 1d11050..09c7a8c
--- a/script.php
+++ b/script.php
@@ -25,7 +25,7 @@
 \r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r
 \r
-require (JIRAFEAU_ROOT . 'lib/config.php');\r
+require (JIRAFEAU_ROOT . 'lib/config.original.php');\r
 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
@@ -33,12 +33,23 @@ require (JIRAFEAU_ROOT . 'lib/lang.php');
  global $script_langages;\r
  $script_langages = array ('bash' => 'Bash');\r
 \r
+/* Operations may take a long time.\r
+ * Be sure PHP's safe mode is off.\r
+ */\r
+@set_time_limit(0);\r
+/* Remove errors. */\r
+@error_reporting(0);\r
+\r
 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
+        require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r
+        exit;\r
+    }\r
     echo '<div class="info">';\r
     echo '<h2>' . t('Welcome to Jirafeau\'s query interface') . '</h2>';\r
     echo '<p>';\r
@@ -131,6 +142,47 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     foreach ($script_langages as $lang => $name)\r
         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 '<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
+    echo '</p>';\r
+    echo '<p>';\r
+    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?init_async</i><br />';\r
+    echo '<br />';\r
+    echo t('Parameters') . ':<br />';\r
+    echo "<b>filename=</b>file_name.ext<i> (" . t('Required') . ")</i> <br />";\r
+    echo "<b>type=</b>MIME_TYPE<i> (" . t('Optional') . ")</i> <br />";\r
+    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 '</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
+\r
+    echo '<h3>' . t('Push data during asynchronous transfert') . ':</h3>';\r
+    echo '<p>';\r
+    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?push_async</i><br />';\r
+    echo '<br />';\r
+    echo t('Parameters') . ':<br />';\r
+    echo "<b>ref=</b>async_reference<i> (" . t('Required') . ")</i> <br />";\r
+    echo "<b>data=</b>data_chunk<i> (" . t('Required') . ")</i> <br />";\r
+    echo "<b>code=</b>last_provided_code<i> (" . t('Required') . ")</i> <br />";\r
+    echo '</p>';\r
+    echo '<p>' . t('This will return brut text content.') . ' ' .\r
+         t('Returns the next code to use.') . '<br /></p>';\r
+\r
+    echo '<h3>' . t('Finalize asynchronous transfert') . ':</h3>';\r
+    echo '<p>';\r
+    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?end_async</i><br />';\r
+    echo '<br />';\r
+    echo t('Parameters') . ':<br />';\r
+    echo "<b>ref=</b>async_reference<i> (" . t('Required') . ")</i> <br />";\r
+    echo "<b>code=</b>last_provided_code<i> (" . t('Required') . ")</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
 \r
     echo '</div><br />';\r
     require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r
@@ -140,10 +192,25 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
 /* Lets use interface now. */\r
 header('Content-Type: text; charset=utf-8');\r
 \r
+check_errors ($cfg);\r
+if (has_error ())\r
+{\r
+    echo "Error";\r
+    exit;\r
+}\r
+\r
 /* Upload file */\r
 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
@@ -175,7 +242,8 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
         }\r
     $res = jirafeau_upload ($_FILES['file'],\r
                             isset ($_POST['one_time_download']),\r
-                            $key, $time, $_SERVER['REMOTE_ADDR']);\r
+                            $key, $time, $_SERVER['REMOTE_ADDR'],\r
+                            $cfg['enable_crypt'], $cfg['link_name_lenght']);\r
     \r
     if (empty($res) || $res['error']['has_error'])\r
     {\r
@@ -184,9 +252,12 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     }\r
     /* Print direct link. */\r
     echo $res['link'];\r
-    echo NL;\r
     /* Print delete link. */\r
+    echo NL;\r
     echo $res['delete_link'];\r
+    /* Print decrypt key. */\r
+    echo NL;\r
+    echo urlencode($res['crypt_key']);\r
 }\r
 elseif (isset ($_GET['h']))\r
 {\r
@@ -198,7 +269,7 @@ elseif (isset ($_GET['h']))
     if (isset ($_GET['d']))\r
         $d = $_GET['d'];\r
     \r
-    if (!preg_match ('/[0-9a-zA-Z_-]{22}$/', $link_name))\r
+    if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))\r
     {\r
         echo "Error";\r
         exit;\r
@@ -234,11 +305,19 @@ elseif (isset ($_GET['h']))
         exit;\r
     }\r
 \r
+    /* Read file. */\r
     header ('Content-Length: ' . $link['file_size']);\r
     header ('Content-Type: ' . $link['mime_type']);\r
     header ('Content-Disposition: attachment; filename="' .\r
             $link['file_name'] . '"');\r
-    readfile (VAR_FILES . $p . $link['md5']);\r
+\r
+    $r = fopen (VAR_FILES . $p . $link['md5'], 'r');\r
+    while (!feof ($r))\r
+    {\r
+        print fread ($r, 1024);\r
+        ob_flush();\r
+    }\r
+    fclose ($r);\r
 \r
     if ($link['onetime'] == 'O')\r
         jirafeau_delete_link ($link_name);\r
@@ -389,7 +468,83 @@ fi
         exit;\r
     }\r
 }\r
+/* 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
+        exit;\r
+    }\r
+\r
+    $type = '';\r
+    if (isset ($_POST['type']))\r
+        $type = $_POST['type'];\r
+    \r
+    $key = '';\r
+    if (isset ($_POST['key']))\r
+        $key = $_POST['key'];\r
+\r
+    $time = time ();\r
+    if (!isset ($_POST['time']))\r
+        $time = JIRAFEAU_INFINITY;\r
+    else\r
+        switch ($_POST['time'])\r
+        {\r
+            case 'minute':\r
+                $time += JIRAFEAU_MINUTE;\r
+                break;\r
+            case 'hour':\r
+                $time += JIRAFEAU_HOUR;\r
+                break;\r
+            case 'day':\r
+                $time += JIRAFEAU_DAY;\r
+                break;\r
+            case 'week':\r
+                $time += JIRAFEAU_WEEK;\r
+                break;\r
+            case 'month':\r
+                $time += JIRAFEAU_MONTH;\r
+                break;\r
+            default:\r
+                $time = JIRAFEAU_INFINITY;\r
+                break;\r
+        }\r
+    echo jirafeau_async_init ($_POST['filename'],\r
+                              $type,\r
+                              isset ($_POST['one_time_download']),\r
+                              $key,\r
+                              $time,\r
+                              $_SERVER['REMOTE_ADDR']);\r
+}\r
+/* Continue an asynchronous upload. */\r
+elseif (isset ($_GET['push_async']))\r
+{\r
+    if ((!isset ($_POST['ref']))\r
+        || (!isset ($_FILES['data']))\r
+        || (!isset ($_POST['code'])))\r
+        echo "Error";\r
+    else\r
+        echo jirafeau_async_push ($_POST['ref'], $_FILES['data'], $_POST['code']);                                      \r
+}\r
+/* Finalize an asynchronous upload. */\r
+elseif (isset ($_GET['end_async']))\r
+{\r
+    if (!isset ($_POST['ref'])\r
+        || !isset ($_POST['code']))\r
+        echo "Error";\r
+    else\r
+        echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_lenght']);\r
+}\r
 else\r
     echo "Error";\r
 exit;\r
-?>
\ No newline at end of file
+?>\r