Fix tmp link name

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
index a6b9457e5f9bfb035253a6a77cf8784136fcd05e..b9685407311d8dcaab4e8adbaebfd57b98cab6cd 100755 (executable)
--- a/script.php
+++ b/script.php
@@ -292,7 +292,8 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
         }\r
     $res = jirafeau_upload ($_FILES['file'],\r
                             isset ($_POST['one_time_download']),\r
         }\r
     $res = jirafeau_upload ($_FILES['file'],\r
                             isset ($_POST['one_time_download']),\r

-                            $key, $time, $_SERVER['REMOTE_ADDR']);\r
+                            $key, $time, $_SERVER['REMOTE_ADDR'],\r
+                            $cfg['enable_crypt'], $cfg['link_name_lenght']);\r

     \r
     if (empty($res) || $res['error']['has_error'])\r
     {\r
     \r
     if (empty($res) || $res['error']['has_error'])\r
     {\r


@@ -301,9 +302,12 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     }\r
     /* Print direct link. */\r
     echo $res['link'];\r
     }\r
     /* Print direct link. */\r
     echo $res['link'];\r

-    echo NL;\r

     /* Print delete link. */\r
     /* Print delete link. */\r

+    echo NL;\r

     echo $res['delete_link'];\r
     echo $res['delete_link'];\r

+    /* Print decrypt key. */\r
+    echo NL;\r
+    echo urlencode($res['crypt_key']);\r

 }\r
 elseif (isset ($_GET['h']))\r
 {\r
 }\r
 elseif (isset ($_GET['h']))\r
 {\r


@@ -315,7 +319,7 @@ elseif (isset ($_GET['h']))
     if (isset ($_GET['d']))\r
         $d = $_GET['d'];\r
     \r
     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
     {\r
         echo "Error";\r
         exit;\r


@@ -580,7 +584,7 @@ elseif (isset ($_GET['end_async']))
         || !isset ($_POST['code']))\r
         echo "Error";\r
     else\r
         || !isset ($_POST['code']))\r
         echo "Error";\r
     else\r

-        echo jirafeau_async_end ($_POST['ref'], $_POST['code']);\r
+        echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_lenght']);\r

 }\r
 /* 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