[BUGFIX] fixing upload speed units

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
index 20eafbfdbc585f2b312aee2fb622eb81564e44b9..791e950bac11db2436d0643b451c86a928b71995 100644 (file)
--- a/script.php
+++ b/script.php
@@ -17,11 +17,8 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*
- * This file permits to easyly script file sending, receiving, deleting, ...
- * If you don't want this feature, you can simply delete this file from your
- * web directory.
- */
+/* This file offer a kind of API for jirafeau. */
+
 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');
@@ -126,10 +123,17 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
         exit;
     }
 
+    // Check if one time download is enabled
+    if (!$cfg['one_time_download'] && isset($_POST['one_time_download'])) {
+        echo 'Error 26: One time download is disabled.';
+        exit;
+    }
+
     $res = jirafeau_upload($_FILES['file'],
-                            isset($_POST['one_time_download']),
-                            $key, $time, get_ip_address($cfg),
-                            $cfg['enable_crypt'], $cfg['link_name_length']);
+                           isset($_POST['one_time_download']),
+                           $key, $time, get_ip_address($cfg),
+                           $cfg['enable_crypt'], $cfg['link_name_length'],
+                           $cfg['file_hash']);
 
     if (empty($res) || $res['error']['has_error']) {
         echo 'Error 6 ' . $res['error']['why'];
@@ -179,8 +183,8 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
         echo 'Error 10';
         exit;
     }
-    $p = s2p($link['md5']);
-    if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+    $p = s2p($link['hash']);
+    if (!file_exists(VAR_FILES . $p . $link['hash'])) {
         echo 'Error 11';
         exit;
     }
@@ -191,7 +195,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     header('Content-Disposition: attachment; filename="' .
             $link['file_name'] . '"');
 
-    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
     while (!feof($r)) {
         print fread($r, 1024);
         ob_flush();
@@ -203,8 +207,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     }
     exit;
 } elseif (isset($_GET['get_capacity'])) {
-    echo min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
-              jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
+    echo jirafeau_get_max_upload_size_bytes();
 } elseif (isset($_GET['get_maximal_upload_size'])) {
     echo $cfg['maximal_upload_size'];
 } elseif (isset($_GET['get_version'])) {
@@ -223,6 +226,7 @@ url='<?php echo $cfg['web_root']; ?>' # Or set JIRAFEAU_URL.
 time='<?php echo $cfg['availability_default']; ?>' # Or set JIRAFEAU_TIME.
 one_time='' # Or set JIRAFEAU_ONE_TIME.
 curl='' # Or set JIRAFEAU_CURL_PATH.
+upload_password='' # Or set JIRAFEAU_UPLOAD_PASSWD
 # Config end
 
 if [ -n "$JIRAFEAU_PROXY" ]; then
@@ -245,6 +249,10 @@ if [ -n "$JIRAFEAU_ONE_TIME" ]; then
     one_time='1'
 fi
 
+if [ -n "$UPLOAD_PASSWD" ]; then
+    upload_password="$JIRAFEAU_UPLOAD_PASSWORD"
+fi
+
 if [ -z "$curl" ]; then
     curl="$JIRAFEAU_CURL_PATH"
 fi
@@ -279,6 +287,7 @@ if [ -z "$2" ]; then
     echo "    JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, »month«, »quarter«, »year« or »none«"
     echo "    JIRAFEAU_ONE_TIME : self-destroy after first download, eg. »1« to enable or »« (empty) to disable"
     echo "    JIRAFEAU_CURL : alternative path to curl binary"
+    echo "    JIRAFEAU_UPLOAD_PASSWD : upload password"
 
     exit 0
 fi
@@ -292,6 +301,10 @@ if [ -n "$one_time" ]; then
     options="$options -F one_time_download=1"
 fi
 
+f [ -n "$upload_password" ]; then
+    options="$options -F upload_password=$upload_password"
+fi
+
 password=''
 if [ -n "$3" ]; then
     password="$3"
@@ -409,6 +422,12 @@ elseif (isset($_GET['init_async'])) {
         $key = $_POST['key'];
     }
 
+    // Check if one time download is enabled
+    if (!$cfg['one_time_download'] && isset($_POST['one_time_download'])) {
+        echo 'Error 26: One time download is disabled.';
+        exit;
+    }
+
     $time = time();
     if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) {
         echo 'Error 22';
@@ -467,7 +486,7 @@ elseif (isset($_GET['end_async'])) {
         || !isset($_POST['code'])) {
         echo 'Error 24';
     } else {
-        echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
+        echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length'], $cfg['file_hash']);
     }
 } else {
     echo 'Error 25';