X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/75c98902b1f1be9a4cd1429886c3089c568e532b..07721aec51e54d92213638ae23a9ef8dbde9a0a8:/script.php?ds=sidebyside diff --git a/script.php b/script.php index ffd2c0e..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" @@ -363,72 +379,6 @@ fi exit; } } -/* Create alias. */ -elseif (isset($_GET['alias_create'])) { - if (isset($_POST['upload_password'])){ - if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { - echo 'Error 14: Invalid password'; - exit; - } - } else { - if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { - echo 'Error 13: No password nor allowed IP'; - exit; - } - } - - if (!isset($_POST['alias']) || - !isset($_POST['destination']) || - !isset($_POST['password'])) { - echo 'Error 15'; - exit; - } - - echo jirafeau_alias_create($_POST['alias'], - $_POST['destination'], - $_POST['password'], - $ip); -} -/* Get alias. */ -elseif (isset($_GET['alias_get'])) { - if (!isset($_POST['alias'])) { - echo 'Error 16'; - exit; - } - - echo jirafeau_alias_get($_POST['alias']); -} -/* Update alias. */ -elseif (isset($_GET['alias_update'])) { - if (!isset($_POST['alias']) || - !isset($_POST['destination']) || - !isset($_POST['password'])) { - echo 'Error 17'; - exit; - } - - $new_password = ''; - if (isset($_POST['new_password'])) { - $new_password = $_POST['new_password']; - } - - echo jirafeau_alias_update($_POST['alias'], - $_POST['destination'], - $_POST['password'], - $new_password, - get_ip_address($cfg)); -} -/* Delete alias. */ -elseif (isset($_GET['alias_delete'])) { - if (!isset($_POST['alias']) || - !isset($_POST['password'])) { - echo 'Error 18'; - exit; - } - - echo jirafeau_alias_delete($_POST['alias'], - $_POST['password']); -} /* Initialize an asynchronous upload. */ elseif (isset($_GET['init_async'])) { if (isset($_POST['upload_password'])){