X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/2b7fd594eb127b5a7e01e664ed54a5fa0be860c2..374e4718ddacfbaab32f57f8e0ab828520e8081e:/script.php diff --git a/script.php b/script.php index d17978c..aa04a6f 100644 --- a/script.php +++ b/script.php @@ -14,7 +14,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* @@ -22,16 +22,14 @@ * If you don't want this feature, you can simply delete this file from your * web directory. */ +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); - -require (JIRAFEAU_ROOT . 'lib/config.original.php'); -require (JIRAFEAU_ROOT . 'lib/settings.php'); -require (JIRAFEAU_ROOT . 'lib/functions.php'); -require (JIRAFEAU_ROOT . 'lib/lang.php'); +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); global $script_langages; - $script_langages = array ('bash' => 'Bash'); + $script_langages = array('bash' => 'Bash'); /* Operations may take a long time. * Be sure PHP's safe mode is off. @@ -40,211 +38,60 @@ require (JIRAFEAU_ROOT . 'lib/lang.php'); /* Remove errors. */ @error_reporting(0); -if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0) -{ - require (JIRAFEAU_ROOT . 'lib/template/header.php'); - check_errors ($cfg); - if (has_error ()) - { - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); +if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); + check_errors($cfg); + if (has_error()) { + show_errors(); + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; - } - echo '<div class="info">'; - echo '<h2>' . t('Welcome to Jirafeau\'s query interface') . '</h2>'; - echo '<p>'; - echo t('This interface permits to script your uploads and downloads.') . - ' ' . t('The instructions above show how to query this interface.'); - echo '</p>'; - - echo '<h3>' . t('Get Jirafeau\'s version') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>get_version=</b>1<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content.') . ' ' . - t('First line is the version number.') . '<br /></p>'; - echo '<p>'; - echo t('Example') . ": <a href=\"" . $web_root . "script.php?get_version=1\">" . $web_root . "script.php?get_version=1</a> "; - echo '</p>'; - - echo '<h3>' . t('Get server capacity') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>get_capacity=</b>1<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content.') . ' ' . - t('First line is the server capacity (in Bytes).') . '<br /></p>'; - echo '<p>'; - echo t('Example') . ": <a href=\"" . $web_root . "script.php?get_capacity=1\">" . $web_root . "script.php?get_capacity=1</a> "; - echo '</p>'; - - echo '<h3>' . t('Maximal allowed size of an uploaded file') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>get_maximal_upload_size=</b>1<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content.') . ' ' . - t('First line returns size (in MB).') . '<br /></p>'; - echo '<p>'; - echo t('Example') . ": <a href=\"" . $web_root . "script.php?get_maximal_upload_size=1\">" . $web_root . "script.php?get_maximal_upload_size=1</a> "; - echo '</p>'; - - echo '<h3>' . t('Upload a file') . ':</h3>'; - echo '<p>'; - echo t('Send a POST query to') . ': <i>' . $web_root . 'script.php</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>file=</b>C:\\your\\file\\path<i> (" . t('Required') . ")</i> <br />"; - echo "<b>time=</b>[minute|hour|day|week|month|year|none]<i> (" . t('Optional') . ', '. t('default: none') . ")</i> <br />"; - echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />"; - echo "<b>one_time_download=</b>1<i> (" . t('Optional') . ")</i> <br />"; - echo "<b>upload_password=</b>your_upload_password<i> (" . t('Optional') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content.') . ' ' . - t('First line is the download reference and the second line the delete code.') . '<br /></p>'; - - echo '<h3>' . t('Get a file') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>h=</b>your_download_reference<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>'; - echo t('If a password has been set, send a POST request with it.'); - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />"; - echo '</p>'; - echo '<p>'; - echo t('Example') . ": <a href=\"" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU\">" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU</a> "; - echo '</p>'; - - echo '<h3>' . t('Delete a file') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>h=</b>your_download_reference<i> (" . t('Required') . ")</i> <br />"; - echo "<b>d=</b>yout_delete_code<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return "Ok" if succeeded, "Error" otherwhise.') . '<br /></p>'; - echo '<p>'; - echo t('Example') . ": <a href=\"" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU&d=0d210a952\">" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU&d=0d210a952</a> "; - echo '</p>'; - - echo '<h3>' . t('Get a generated script') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>lang=</b>["; - foreach ($script_langages as $lang => $name) - echo $lang; - echo "]<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content of the code.') . '<br /></p>'; - echo '<p>'; - echo t('Example') . ": <br />"; - foreach ($script_langages as $lang => $name) - echo "$name: <a href=\"" . $web_root . "script.php?lang=$lang\">" . $web_root . "script.php?lang=$lang</a> "; - echo '</p>'; - - echo '<h3>' . t('Initalize an asynchronous transfer') . ':</h3>'; - echo '<p>'; - echo t('The goal is to permit to transfer big file, chunk by chunk.') . ' '; - echo t('Chunks of data must be sent in order.'); - echo '</p>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?init_async</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>filename=</b>file_name.ext<i> (" . t('Required') . ")</i> <br />"; - echo "<b>type=</b>MIME_TYPE<i> (" . t('Optional') . ")</i> <br />"; - echo "<b>time=</b>[minute|hour|day|week|month|year|none]<i> (" . t('Optional') . ', '. t('default: none') . ")</i> <br />"; - echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />"; - echo "<b>one_time_download=</b>1<i> (" . t('Optional') . ")</i> <br />"; - echo "<b>upload_password=</b>your_upload_password<i> (" . t('Optional') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content.') . ' ' . - t('First line is the asynchronous transfer reference and the second line the code to use in the next operation.') . '<br /></p>'; - - echo '<h3>' . t('Push data during asynchronous transfer') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?push_async</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>ref=</b>async_reference<i> (" . t('Required') . ")</i> <br />"; - echo "<b>data=</b>data_chunk<i> (" . t('Required') . ")</i> <br />"; - echo "<b>code=</b>last_provided_code<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content.') . ' ' . - t('Returns the next code to use.') . '<br /></p>'; - - echo '<h3>' . t('Finalize asynchronous transfer') . ':</h3>'; - echo '<p>'; - echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?end_async</i><br />'; - echo '<br />'; - echo t('Parameters') . ':<br />'; - echo "<b>ref=</b>async_reference<i> (" . t('Required') . ")</i> <br />"; - echo "<b>code=</b>last_provided_code<i> (" . t('Required') . ")</i> <br />"; - echo '</p>'; - echo '<p>' . t('This will return brut text content.') . ' ' . - t('First line is the download reference and the second line the delete code.') . '<br /></p>'; - - echo '</div><br />'; - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); + } ?> + <div class="info"> + <h2>Scripting interface</h2> + <p>This interface permits to script your uploads and downloads.</p> + <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to get available calls :)</p> + <p>You may download a preconfigured <a href="script.php?lang=bash">Bash Script</a> to easily send to and get files from the API via command line.</p> + </div> + <br /> + <?php + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } /* 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 ()) -{ - echo "Error"; +check_errors($cfg); +if (has_error()) { + echo 'Error 1'; exit; } /* Upload file */ -if (isset ($_FILES['file']) && is_writable (VAR_FILES) - && is_writable (VAR_LINKS)) -{ - if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg))) - { - echo "Error"; - exit; - } - - if (jirafeau_has_upload_password ($cfg) && - (!isset ($_POST['upload_password']) || - !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))) - { - echo "Error"; - exit; +if (isset($_FILES['file']) && is_writable(VAR_FILES) + && is_writable(VAR_LINKS)) { + if (isset ($_POST['upload_password'])) { + if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { + echo 'Error 3: Invalid password'; + exit; + } + } else { + if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { + echo 'Error 2: No password nor allowed IP'; + exit; + } } - $key = ''; - if (isset ($_POST['key'])) + if (isset($_POST['key'])) { $key = $_POST['key']; + } - $time = time (); - if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) - { - echo "Error"; + $time = time(); + if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) { + echo 'Error 4: The parameter time is invalid.'; exit; - } - else - switch ($_POST['time']) - { + } else { + switch ($_POST['time']) { case 'minute': $time += JIRAFEAU_MINUTE; break; @@ -260,6 +107,9 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES) case 'month': $time += JIRAFEAU_MONTH; break; + case 'quarter': + $time += JIRAFEAU_QUARTER; + break; case 'year': $time += JIRAFEAU_YEAR; break; @@ -267,23 +117,22 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES) $time = JIRAFEAU_INFINITY; break; } + } // Check file size if ($cfg['maximal_upload_size'] > 0 && - $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024) - { - echo "Error"; + $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024) { + echo 'Error 5: Your file exceeds the maximum authorized file size.'; exit; } - $res = jirafeau_upload ($_FILES['file'], - isset ($_POST['one_time_download']), + $res = jirafeau_upload($_FILES['file'], + isset($_POST['one_time_download']), $key, $time, get_ip_address($cfg), $cfg['enable_crypt'], $cfg['link_name_length']); - - if (empty($res) || $res['error']['has_error']) - { - echo "Error"; + + if (empty($res) || $res['error']['has_error']) { + echo 'Error 6 ' . $res['error']['why']; exit; } /* Print direct link. */ @@ -294,102 +143,86 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES) /* Print decrypt key. */ echo NL; echo urlencode($res['crypt_key']); -} -elseif (isset ($_GET['h'])) -{ +} elseif (isset($_GET['h'])) { $link_name = $_GET['h']; $key = ''; - if (isset ($_POST['key'])) + if (isset($_POST['key'])) { $key = $_POST['key']; + } $d = ''; - if (isset ($_GET['d'])) + if (isset($_GET['d'])) { $d = $_GET['d']; - - if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name)) - { - echo "Error"; + } + + if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) { + echo 'Error 7'; exit; } - - $link = jirafeau_get_link ($link_name); - if (count ($link) == 0) - { - echo "Error"; + + $link = jirafeau_get_link($link_name); + if (count($link) == 0) { + echo 'Error 8'; exit; } - if (strlen ($d) > 0 && $d == $link['link_code']) - { - jirafeau_delete_link ($link_name); + if (strlen($d) > 0 && $d == $link['link_code']) { + jirafeau_delete_link($link_name); echo "Ok"; exit; } - if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time']) - { - jirafeau_delete_link ($link_name); - echo "Error"; + if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) { + jirafeau_delete_link($link_name); + echo 'Error 9'; exit; } - if (strlen ($link['key']) > 0 && md5 ($key) != $link['key']) - { - echo "Error"; + if (strlen($link['key']) > 0 && md5($key) != $link['key']) { + sleep(2); + echo 'Error 10'; exit; } - $p = s2p ($link['md5']); - if (!file_exists (VAR_FILES . $p . $link['md5'])) - { - echo "Error"; + $p = s2p($link['md5']); + if (!file_exists(VAR_FILES . $p . $link['md5'])) { + echo 'Error 11'; exit; } /* Read file. */ - header ('Content-Length: ' . $link['file_size']); - header ('Content-Type: ' . $link['mime_type']); - header ('Content-Disposition: attachment; filename="' . + header('Content-Length: ' . $link['file_size']); + header('Content-Type: ' . $link['mime_type']); + header('Content-Disposition: attachment; filename="' . $link['file_name'] . '"'); - $r = fopen (VAR_FILES . $p . $link['md5'], 'r'); - while (!feof ($r)) - { - print fread ($r, 1024); + $r = fopen(VAR_FILES . $p . $link['md5'], 'r'); + while (!feof($r)) { + print fread($r, 1024); ob_flush(); } - fclose ($r); + fclose($r); - if ($link['onetime'] == 'O') - jirafeau_delete_link ($link_name); + if ($link['onetime'] == 'O') { + jirafeau_delete_link($link_name); + } 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'))); -} -elseif (isset ($_GET['get_maximal_upload_size'])) -{ +} elseif (isset($_GET['get_capacity'])) { + echo jirafeau_get_max_upload_size_bytes(); +} elseif (isset($_GET['get_maximal_upload_size'])) { echo $cfg['maximal_upload_size']; -} -elseif (isset ($_GET['get_version'])) -{ +} elseif (isset($_GET['get_version'])) { echo JIRAFEAU_VERSION; -} -elseif (isset ($_GET['lang'])) -{ +} elseif (isset($_GET['lang'])) { $l=$_GET['lang']; - if ($l == "bash") - { -?> + if ($l == "bash") { + ?> #!/bin/bash -# This script has been auto-generated by Jirafeau but you can still edit -# options below. +# This script has been auto-generated by Jirafeau but you can still edit options below. -# Config -proxy='' # ex: proxy='proxysever.test.com:3128' or set JIRAFEAU_PROXY global variable -url='<?php echo $cfg['web_root'] . 'script.php'; ?>' # or set JIRAFEAU_URL ex: url='http://mysite/jirafeau/script.php' -time='none' # minute, hour, day, week, month, year or none. Or set JIRAFEAU_TIME. -one_time='' # ex: one_time="1" or set JIRAFEAU_ONE_TIME. -curl='' # curl path to download or set JIRAFEAU_CURL_PATH. -# End of config +# Config begin +proxy='' # Or set JIRAFEAU_PROXY. +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. +# Config end if [ -n "$JIRAFEAU_PROXY" ]; then proxy="$JIRAFEAU_PROXY" @@ -429,17 +262,22 @@ if [ -z "$curl" ]; then fi if [ -z "$2" ]; then - echo "man:" - echo " $0 send PATH [PASSWORD]" + echo "Jirafeau Bash Script <?php echo JIRAFEAU_VERSION; ?>" + echo "--------------------------" + echo "Usage:" + echo " $0 OPTIONS" + echo + echo "Options:" + echo " $0 send FILE [PASSWORD]" echo " $0 get URL [PASSWORD]" echo " $0 delete URL" - echo "" + echo echo "Global variables to export:" - echo " JIRAFEAU_PROXY : example: proxysever.test.com:3128" - echo " JIRAFEAU_URL : example: http://mysite/jirafeau/script.php" - echo " JIRAFEAU_TIME : minute, hour, day, week, year, month or none" - echo " JIRAFEAU_ONE_TIME : set anything or set empty" - echo " JIRAFEAU_CURL : path to your curl binary" + echo " JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxysever.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_ONE_TIME : self-destroy after first download, eg. »1« to enable or »« (empty) to disable" + echo " JIRAFEAU_CURL : alternative path to curl binary" exit 0 fi @@ -459,6 +297,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." @@ -469,10 +310,11 @@ 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 + if [[ "$res" == Error* ]]; then echo "Error while uploading." + echo $res exit fi @@ -489,8 +331,38 @@ if [ "$1" == "send" ]; then fi cnt=$(( cnt + 1 )) done) - echo "${url}?h=$code" - echo "${url}?h=$code&d=$del_code" + 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:" + if [[ $key_code ]]; then + echo " ${url}${downloadpage}?h=$code&k=$key_code" + else + echo " ${url}${downloadpage}?h=$code" + fi + echo "Direct download:" + 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:" + 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" + elif [ "$1" == "get" ]; then if [ -z "$password" ]; then $curl $proxy -OJ "$2" @@ -501,129 +373,47 @@ elif [ "$1" == "delete" ]; then $curl $proxy "$2" fi <?php - } - else - { - echo "Error"; - exit; - } -} -/* Create alias. */ -elseif (isset ($_GET['alias_create'])) -{ - $ip = get_ip_address($cfg); - if (!jirafeau_challenge_upload_ip ($cfg, $ip)) - { - echo "Error"; - exit; - } - - if (jirafeau_has_upload_password ($cfg) && - (!isset ($_POST['upload_password']) || - !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))) - { - echo "Error"; - exit; - } - - if (!isset ($_POST['alias']) || - !isset ($_POST['destination']) || - !isset ($_POST['password'])) - { - echo "Error"; - 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"; - 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"; - 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"; + } else { + echo 'Error 12'; exit; } - - echo jirafeau_alias_delete ($_POST['alias'], - $_POST['password']); } /* Initialize an asynchronous upload. */ -elseif (isset ($_GET['init_async'])) -{ - if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg))) - { - echo "Error"; - exit; - } - - if (jirafeau_has_upload_password ($cfg) && - (!isset ($_POST['upload_password']) || - !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))) - { - echo "Error"; - exit; +elseif (isset($_GET['init_async'])) { + if (isset($_POST['upload_password'])){ + if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { + echo 'Error 20: Invalid password'; + exit; + } + } else { + if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { + echo 'Error 19: No password nor allowed IP'; + exit; + } } - if (!isset ($_POST['filename'])) - { - echo "Error"; + if (!isset($_POST['filename'])) { + echo 'Error 21'; exit; } $type = ''; - if (isset ($_POST['type'])) + if (isset($_POST['type'])) { $type = $_POST['type']; - + } + $key = ''; - if (isset ($_POST['key'])) + if (isset($_POST['key'])) { $key = $_POST['key']; + } - $time = time (); - if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) - { - echo "Error"; + $time = time(); + if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) { + echo 'Error 22'; exit; - } - else - switch ($_POST['time']) - { + } else { + switch ($_POST['time']) { case 'minute': $time += JIRAFEAU_MINUTE; break; @@ -639,6 +429,9 @@ elseif (isset ($_GET['init_async'])) case 'month': $time += JIRAFEAU_MONTH; break; + case 'quarter': + $time += JIRAFEAU_QUARTER; + break; case 'year': $time += JIRAFEAU_YEAR; break; @@ -646,39 +439,37 @@ elseif (isset ($_GET['init_async'])) $time = JIRAFEAU_INFINITY; break; } - echo jirafeau_async_init ($_POST['filename'], + } + echo jirafeau_async_init($_POST['filename'], $type, - isset ($_POST['one_time_download']), + isset($_POST['one_time_download']), $key, $time, get_ip_address($cfg)); } /* Continue an asynchronous upload. */ -elseif (isset ($_GET['push_async'])) -{ - if ((!isset ($_POST['ref'])) - || (!isset ($_FILES['data'])) - || (!isset ($_POST['code']))) - echo "Error"; - else - { - echo jirafeau_async_push ($_POST['ref'], +elseif (isset($_GET['push_async'])) { + if ((!isset($_POST['ref'])) + || (!isset($_FILES['data'])) + || (!isset($_POST['code']))) { + echo 'Error 23'; + } else { + echo jirafeau_async_push($_POST['ref'], $_FILES['data'], $_POST['code'], $cfg['maximal_upload_size']); } } /* Finalize an asynchronous upload. */ -elseif (isset ($_GET['end_async'])) -{ - if (!isset ($_POST['ref']) - || !isset ($_POST['code'])) - echo "Error"; - else - echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']); +elseif (isset($_GET['end_async'])) { + if (!isset($_POST['ref']) + || !isset($_POST['code'])) { + echo 'Error 24'; + } else { + echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']); + } +} else { + echo 'Error 25'; } -else - echo "Error"; exit; ?> -