Closes #6 can use several upload passwords in options

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
index 3185de720d5a3b2c188894fc23025b13f941a786..d109d4a6c8e746fe42e0b8ecc849264e9304aa13 100644 (file)
--- a/script.php
+++ b/script.php
@@ -263,7 +263,9 @@ if (has_error ())
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)\r
     && is_writable (VAR_LINKS))\r
 {\r
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)\r
     && is_writable (VAR_LINKS))\r
 {\r

-    if (strlen ($cfg['upload_password']) > 0 && (!isset ($_POST['upload_password']) || $_POST['upload_password'] != $cfg['upload_password']))\r
+    if (jirafeau_has_upload_password ($cfg) &&\r
+         (!isset ($_POST['upload_password']) ||\r
+          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))\r

     {\r
         echo "Error";\r
         exit;\r
     {\r
         echo "Error";\r
         exit;\r


@@ -529,7 +531,9 @@ fi
 /* Initialize an asynchronous upload. */\r
 elseif (isset ($_GET['init_async']))\r
 {\r
 /* Initialize an asynchronous upload. */\r
 elseif (isset ($_GET['init_async']))\r
 {\r

-    if (strlen ($cfg['upload_password']) > 0 && (!isset ($_POST['upload_password']) || $_POST['upload_password'] != $cfg['upload_password']))\r
+    if (jirafeau_has_upload_password ($cfg) &&\r
+         (!isset ($_POST['upload_password']) ||\r
+          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))\r

     {\r
         echo "Error";\r
         exit;\r
     {\r
         echo "Error";\r
         exit;\r


@@ -546,8 +550,8 @@ elseif (isset ($_GET['init_async']))
         $type = $_POST['type'];\r
     \r
     $key = '';\r
         $type = $_POST['type'];\r
     \r
     $key = '';\r

-    if (isset ($_POST['password']))\r
-        $key = $_POST['password'];\r
+    if (isset ($_POST['key']))\r
+        $key = $_POST['key'];\r

 \r
     $time = time ();\r
     if (!isset ($_POST['time']))\r
 \r
     $time = time ();\r
     if (!isset ($_POST['time']))\r


@@ -603,7 +607,9 @@ elseif (isset ($_GET['end_async']))
 /* Initialize block. */\r
 elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])\r
 {\r
 /* Initialize block. */\r
 elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])\r
 {\r

-    if (strlen ($cfg['upload_password']) > 0 && (!isset ($_POST['upload_password']) || $_POST['upload_password'] != $cfg['upload_password']))\r
+    if (jirafeau_has_upload_password ($cfg) &&\r
+         (!isset ($_POST['upload_password']) ||\r
+          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))\r

     {\r
         echo "Error";\r
         exit;\r
     {\r
         echo "Error";\r
         exit;\r