Add .gitignore for var-* and lib/config.local.php

[jirafeau.git] / script.php

diff --git a/script.php b/script.php
index 2409f1bde0bd68817fdd685183f85315e103890d..19f14a8e05442cbeff2a744fe38917525c8e3b76 100755 (executable)
--- a/script.php
+++ b/script.php
@@ -25,7 +25,7 @@
 \r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r
 \r
-require (JIRAFEAU_ROOT . 'lib/config.php');\r
+require (JIRAFEAU_ROOT . 'lib/config.original.php');\r
 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
@@ -36,7 +36,9 @@ require (JIRAFEAU_ROOT . 'lib/lang.php');
 /* 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
@@ -261,6 +263,12 @@ if (has_error ())
 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
@@ -319,7 +327,7 @@ elseif (isset ($_GET['h']))
     if (isset ($_GET['d']))\r
         $d = $_GET['d'];\r
     \r
-    if (!preg_match ('/[0-9a-zA-Z_-]{22}$/', $link_name))\r
+    if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))\r
     {\r
         echo "Error";\r
         exit;\r
@@ -521,6 +529,12 @@ fi
 /* 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
@@ -589,6 +603,12 @@ elseif (isset ($_GET['end_async']))
 /* 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