X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/7991901d3f74146678b9f9c64b66aca2b3fae2e4..6e8b52dff66913b26a548bcf36a43b2329a35f25:/script.php?ds=sidebyside diff --git a/script.php b/script.php index 695f6db..0d4aeab 100644 --- a/script.php +++ b/script.php @@ -1,7 +1,7 @@ + * Copyright (C) 2015 Jerome Jutteau * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,11 +17,8 @@ * along with this program. If not, see . */ -/* - * 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'); @@ -35,8 +32,6 @@ require(JIRAFEAU_ROOT . 'lib/lang.php'); * Be sure PHP's safe mode is off. */ @set_time_limit(0); -/* Remove errors. */ -@error_reporting(0); if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); @@ -70,7 +65,7 @@ if (has_error()) { /* Upload file */ if (isset($_FILES['file']) && is_writable(VAR_FILES) && is_writable(VAR_LINKS)) { - if (isset ($_POST['upload_password'])) { + if (isset($_POST['upload_password'])) { if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { echo 'Error 3: Invalid password'; exit; @@ -104,6 +99,9 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) case 'week': $time += JIRAFEAU_WEEK; break; + case 'fortnight': + $time += JIRAFEAU_FORTNIGHT; + break; case 'month': $time += JIRAFEAU_MONTH; break; @@ -132,11 +130,22 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) exit; } - $res = jirafeau_upload($_FILES['file'], - isset($_POST['one_time_download']), - $key, $time, get_ip_address($cfg), - $cfg['enable_crypt'], $cfg['link_name_length'], - $cfg['file_hash']); + if ($cfg['store_uploader_ip']) { + $ip = get_ip_address($cfg); + } else { + $ip = ""; + } + + $res = jirafeau_upload( + $_FILES['file'], + isset($_POST['one_time_download']), + $key, + $time, + $ip, + $cfg['enable_crypt'], + $cfg['link_name_length'], + $cfg['file_hash'] + ); if (empty($res) || $res['error']['has_error']) { echo 'Error 6 ' . $res['error']['why']; @@ -201,7 +210,6 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) $r = fopen(VAR_FILES . $p . $link['hash'], 'r'); while (!feof($r)) { print fread($r, 1024); - ob_flush(); } fclose($r); @@ -252,8 +260,8 @@ if [ -n "$JIRAFEAU_ONE_TIME" ]; then one_time='1' fi -if [ -n "$UPLOAD_PASSWD" ]; then - upload_password="$JIRAFEAU_UPLOAD_PASSWORD" +if [ -n "$JIRAFEAU_UPLOAD_PASSWD" ]; then + upload_password="$JIRAFEAU_UPLOAD_PASSWD" fi if [ -z "$curl" ]; then @@ -285,9 +293,9 @@ if [ -z "$2" ]; then echo " $0 delete URL" echo echo "Global variables to export:" - echo " JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxysever.example.com:3128«" + echo " JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxyserver.example.com:3128«" echo " JIRAFEAU_URL : URI to Jirafeau installation with trailing slash, eg. »https://example.com/jirafeau/«" - echo " JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, »month«, »quarter«, »year« or »none«" + echo " JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, fortnight, »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" @@ -304,7 +312,7 @@ if [ -n "$one_time" ]; then options="$options -F one_time_download=1" fi -f [ -n "$upload_password" ]; then +if [ -n "$upload_password" ]; then options="$options -F upload_password=$upload_password" fi @@ -373,12 +381,12 @@ if [ "$1" == "send" ]; then echo echo "Download via API:" if [[ $key_code ]]; then - echo " ${0} get ${url}${apipage}?h=$code&k=$key_code [PASSWORD}" + echo " ${0} get ${url}${apipage}?h=$code&k=$key_code [PASSWORD]" else - echo " ${0} get ${url}${apipage}?h=$code [PASSWORD}" + echo " ${0} get ${url}${apipage}?h=$code [PASSWORD]" fi echo "Delete via API:" - echo " ${0} delete ${url}${downloadpage}?h=$code&d=$del_code" + echo " ${0} delete \"${url}${downloadpage}?h=$code&d=$del_code\"" elif [ "$1" == "get" ]; then if [ -z "$password" ]; then @@ -387,10 +395,9 @@ elif [ "$1" == "get" ]; then $curl $proxy -OJ -X POST -F key=$password "$2" fi elif [ "$1" == "delete" ]; then - $curl $proxy "$2" + $curl $proxy "$2" --data-raw "do_delete=1%2F" | grep "div class" |sed -e "s/<[^>]\+>//g" fi