X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/7dd194ef30800534bb97c1e4a4cccbf93c59d5e9..18b6e57c0091dfdd14427c940346da59298b29eb:/script.php diff --git a/script.php b/script.php index 3905d2f..5e02456 100644 --- a/script.php +++ b/script.php @@ -64,7 +64,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0) } /* Lets use interface now. */ -header('Content-Type: text; charset=utf-8'); +header('Content-Type: text/plain; charset=utf-8'); check_errors ($cfg); if (has_error ()) @@ -247,7 +247,7 @@ elseif (isset ($_GET['lang'])) # Config begin proxy='' # Or set JIRAFEAU_PROXY. -url='' # Or set JIRAFEAU_URL. +url='' # Or set JIRAFEAU_URL. time='' # Or set JIRAFEAU_TIME. one_time='' # Or set JIRAFEAU_ONE_TIME. curl='' # Or set JIRAFEAU_CURL_PATH. @@ -303,7 +303,7 @@ if [ -z "$2" ]; then echo echo "Global variables to export:" echo " JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxysever.example.com:3128«" - echo " JIRAFEAU_URL : URI to Jirafeau installation and API page with trailing slash, eg. »https://example.com/jirafeau/script.php«" + 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_ONE_TIME : self-destroy after first download, eg. »1« to enable or »« (empty) to disable" echo " JIRAFEAU_CURL : alternative path to curl binary" @@ -326,6 +326,9 @@ if [ -n "$3" ]; then options="$options -F key=$password" fi +apipage='script.php' +downloadpage='f.php' + if [ "$1" == "send" ]; then if [ ! -f "$2" ]; then echo "File \"$2\" does not exists." @@ -336,7 +339,7 @@ if [ "$1" == "send" ]; then res=$($curl -X POST --http1.0 $proxy $options \ -F "time=$time" \ -F "file=@$2" \ - $url) + $url$apipage) if [[ "$res" == Error* ]]; then echo "Error while uploading." @@ -357,12 +360,20 @@ if [ "$1" == "send" ]; then fi cnt=$(( cnt + 1 )) done) - echo "Download link:" - echo "${url}?h=$code" - echo "Direct download link:" - echo "${url}?h=$code&d=1" + + echo + echo "Download page:" + echo " ${url}${downloadpage}?h=$code" + echo "Direct download:" + echo " ${url}${downloadpage}?h=$code&d=1" echo "Delete link:" - echo "${url}?h=$code&d=$del_code" + echo " ${url}${downloadpage}?h=$code&d=$del_code" + echo + echo "Download via API:" + echo " ${0} get ${url}${apipage}?h=$code [PASSWORD}" + echo "Delete via API:" + echo " ${0} delete ${url}${downloadpage}?h=$code&d=$del_code" + elif [ "$1" == "get" ]; then if [ -z "$password" ]; then $curl $proxy -OJ "$2"