Add encryption feature (disabled by default).

[jirafeau_project.git] / script.php

diff --git a/script.php b/script.php
index a6b9457e5f9bfb035253a6a77cf8784136fcd05e..7d5e25c37d5238f78f436371892c398ebb0177a1 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
-                            $key, $time, $_SERVER['REMOTE_ADDR']);\r
+                            $key, $time, $_SERVER['REMOTE_ADDR'],\r
+                            $cfg['enable_crypt']);\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
-    echo NL;\r
     /* Print delete link. */\r
+    echo NL;\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
@@ -580,7 +584,7 @@ elseif (isset ($_GET['end_async']))
         || !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']);\r
 }\r
 /* Initialize block. */\r
 elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])\r