fix error on link encrypted parameters

[jirafeau_project.git] / script.php

diff --git a/script.php b/script.php
old mode 100755 (executable)
new mode 100644 (file)
index 1d420b6..44fe449
--- a/script.php
+++ b/script.php
@@ -36,12 +36,14 @@ require (JIRAFEAU_ROOT . 'lib/lang.php');
 /* Operations may take a long time.\r
  * Be sure PHP's safe mode is off.\r
  */\r
 /* Operations may take a long time.\r
  * Be sure PHP's safe mode is off.\r
  */\r

- set_time_limit(0);\r
+@set_time_limit(0);\r
+/* Remove errors. */\r
+@error_reporting(0);\r

 \r
 if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)\r
 {\r
     require (JIRAFEAU_ROOT . 'lib/template/header.php');\r
 \r
 if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)\r
 {\r
     require (JIRAFEAU_ROOT . 'lib/template/header.php');\r

-    check_errors ();\r
+    check_errors ($cfg);\r

     if (has_error ())\r
     {\r
         show_errors ();\r
     if (has_error ())\r
     {\r
         show_errors ();\r


@@ -250,7 +252,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
 /* Lets use interface now. */\r
 header('Content-Type: text; charset=utf-8');\r
 \r
 /* Lets use interface now. */\r
 header('Content-Type: text; charset=utf-8');\r
 \r

-check_errors ();\r
+check_errors ($cfg);\r

 if (has_error ())\r
 {\r
     echo "Error";\r
 if (has_error ())\r
 {\r
     echo "Error";\r


@@ -261,6 +263,12 @@ 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
+    {\r
+        echo "Error";\r
+        exit;\r
+    }\r
+\r

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


@@ -521,6 +529,12 @@ 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
+    {\r
+        echo "Error";\r
+        exit;\r
+    }\r
+\r

     if (!isset ($_POST['filename']))\r
     {\r
         echo "Error";\r
     if (!isset ($_POST['filename']))\r
     {\r
         echo "Error";\r


@@ -532,8 +546,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


@@ -589,6 +603,12 @@ 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
+    {\r
+        echo "Error";\r
+        exit;\r
+    }\r
+\r

     if (!isset ($_POST['size']))\r
         echo "Error";\r
     else\r
     if (!isset ($_POST['size']))\r
         echo "Error";\r
     else\r