X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/blobdiff_plain/ea13ecd5272b130c028b76b91b2a05ea65fd565b..ebf674f006db80fd52753711852212b6ca51e4e6:/script.php diff --git a/script.php b/script.php index 5f3bc6f..bcca4f7 100644 --- a/script.php +++ b/script.php @@ -74,7 +74,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) !jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { echo 'Error 3: Invalid password'; exit; - } elseif (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { + } elseif (!isset($_POST['upload_password']) && !jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { echo 'Error 2: No password nor allowed IP'; exit; } @@ -94,7 +94,9 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) exit; } - if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) { + if (!isset($_POST['time'])) { + $time = jirafeau_datestr_to_int($cfg['availability_default']); + } elseif (!$cfg['availabilities'][$_POST['time']]) { echo 'Error 4: The parameter time is invalid.'; exit; } else { @@ -163,7 +165,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) $d = $_GET['d']; } - if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) { + if (!preg_match('/^[0-9a-zA-Z_-]+$/', $link_name)) { echo 'Error 7'; exit; } @@ -183,7 +185,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) echo 'Error 9'; exit; } - if (strlen($link['key']) > 0 && md5($key) != $link['key']) { + if (strlen($link['key']) > 0 && hash('sha256', $key) != $link['key']) { sleep(2); echo 'Error 10'; exit; @@ -320,7 +322,7 @@ downloadpage='f.php' if [ "$1" == "send" ]; then if [ ! -f "$2" ]; then - echo "File \"$2\" does not exists." + echo "File \"$2\" does not exist." exit fi @@ -441,7 +443,9 @@ elseif (isset($_GET['init_async'])) { exit; } - if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) { + if (!isset($_POST['time'])) { + $time = jirafeau_datestr_to_int($cfg['availability_default']); + } elseif (!$cfg['availabilities'][$_POST['time']]) { echo 'Error 22'; exit; } else {