X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/379a0267c27b3731c60b7221f8f533aaf418fcae..c06017ceda35258383a3388c795ad8eb882fd49d:/script.php

diff --git a/script.php b/script.php
index 50726f2..aa04a6f 100644
--- a/script.php
+++ b/script.php
@@ -81,7 +81,6 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
             exit;
         }
     }
-    
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
@@ -204,8 +203,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'])) {
@@ -333,17 +331,35 @@ if [ "$1" == "send" ]; then
         fi
         cnt=$(( cnt + 1 ))
         done)
+    key_code=$(cnt=0; echo "$res" | while read l; do
+        if [[ "$cnt" == "2" ]]; then
+            echo "$l"
+        fi
+        cnt=$(( cnt + 1 ))
+        done)
 
     echo
     echo "Download page:"
-    echo "    ${url}${downloadpage}?h=$code"
+    if [[ $key_code ]]; then
+        echo "    ${url}${downloadpage}?h=$code&k=$key_code"
+    else
+        echo "    ${url}${downloadpage}?h=$code"
+    fi
     echo "Direct download:"
-    echo "    ${url}${downloadpage}?h=$code&d=1"
+    if [[ $key_code ]]; then
+        echo "    ${url}${downloadpage}?h=$code&k=$key_code&d=1"
+    else
+        echo "    ${url}${downloadpage}?h=$code&d=1"
+    fi
     echo "Delete link:"
     echo "    ${url}${downloadpage}?h=$code&d=$del_code"
     echo
     echo "Download via API:"
-    echo "    ${0} get ${url}${apipage}?h=$code [PASSWORD}"
+    if [[ $key_code ]]; then
+        echo "    ${0} get ${url}${apipage}?h=$code&k=$key_code [PASSWORD}"
+    else
+        echo "    ${0} get ${url}${apipage}?h=$code [PASSWORD}"
+    fi
     echo "Delete via API:"
     echo "    ${0} delete ${url}${downloadpage}?h=$code&d=$del_code"