X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/blobdiff_plain/39ff6f56cbd8157556111441c987f2dd3258090a..28f463b24538dfba26dd186bd9f63144f5f8ca21:/script.php?ds=sidebyside diff --git a/script.php b/script.php index 301ebe8..da3785f 100644 --- a/script.php +++ b/script.php @@ -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,9 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) echo 'Error 9'; exit; } - if (strlen($link['key']) > 0 && hash('sha256', $key) != $link['key']) { + // info: link contains the used hash as prefix + $file_hash = "[SHA256]" . hash('sha256', $key); + if (strlen($link['key']) > 0 && $file_hash != $link['key']) { sleep(2); echo 'Error 10'; exit; @@ -441,7 +445,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 {