Merge remote-tracking branch 'origin/master'

[jirafeau.git] / script.php

diff --git a/script.php b/script.php
index 8d6947b042815ed7e947b1d60d65b77ac5c2dba2..b9a6e924ce79e73088a4578db1a6543b315d6a6f 100644 (file)
--- a/script.php
+++ b/script.php
@@ -14,7 +14,7 @@
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /*
@@ -52,9 +52,9 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     }
     ?>
     <div class="info">
-    <h2>Scriting interface</h2>
+    <h2>Scripting interface</h2>
     <p>This interface permits to script your uploads and downloads.</p>
-    <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to understand availablee calls :)</p>
+    <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to get available calls :)</p>
     </div>
     <br />
     <?php
@@ -68,7 +68,7 @@ header('Content-Type: text; charset=utf-8');
 check_errors ($cfg);
 if (has_error ())
 {
-    echo "Error";
+    echo 'Error';
     exit;
 }
 
@@ -78,7 +78,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
 {
     if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -86,7 +86,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -97,7 +97,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     $time = time ();
     if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
     else
@@ -130,7 +130,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     if ($cfg['maximal_upload_size'] > 0 &&
         $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -141,7 +141,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     
     if (empty($res) || $res['error']['has_error'])
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
     /* Print direct link. */
@@ -165,14 +165,14 @@ elseif (isset ($_GET['h']))
     
     if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
     
     $link = jirafeau_get_link ($link_name);
     if (count ($link) == 0)
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
     if (strlen ($d) > 0 && $d == $link['link_code'])
@@ -184,18 +184,19 @@ elseif (isset ($_GET['h']))
     if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
     {
         jirafeau_delete_link ($link_name);
-        echo "Error";
+        echo 'Error';
         exit;
     }
     if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
     {
-        echo "Error";
+        sleep (2);
+        echo 'Error';
         exit;
     }
     $p = s2p ($link['md5']);
     if (!file_exists (VAR_FILES . $p . $link['md5']))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -362,7 +363,7 @@ fi
     }
     else
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 }
@@ -372,7 +373,7 @@ elseif (isset ($_GET['alias_create']))
     $ip = get_ip_address($cfg);
     if (!jirafeau_challenge_upload_ip ($cfg, $ip))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -380,7 +381,7 @@ elseif (isset ($_GET['alias_create']))
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -388,7 +389,7 @@ elseif (isset ($_GET['alias_create']))
         !isset ($_POST['destination']) ||
         !isset ($_POST['password']))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -402,7 +403,7 @@ elseif (isset ($_GET['alias_get']))
 {
     if (!isset ($_POST['alias']))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -415,7 +416,7 @@ elseif (isset ($_GET['alias_update']))
         !isset ($_POST['destination']) ||
         !isset ($_POST['password']))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -435,7 +436,7 @@ elseif (isset ($_GET['alias_delete']))
     if (!isset ($_POST['alias']) ||
         !isset ($_POST['password']))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -447,7 +448,7 @@ elseif (isset ($_GET['init_async']))
 {
     if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -455,13 +456,13 @@ elseif (isset ($_GET['init_async']))
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
     if (!isset ($_POST['filename']))
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
 
@@ -476,7 +477,7 @@ elseif (isset ($_GET['init_async']))
     $time = time ();
     if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
     {
-        echo "Error";
+        echo 'Error';
         exit;
     }
     else
@@ -517,7 +518,7 @@ elseif (isset ($_GET['push_async']))
     if ((!isset ($_POST['ref']))
         || (!isset ($_FILES['data']))
         || (!isset ($_POST['code'])))
-        echo "Error";
+        echo 'Error';
     else
     {
         echo jirafeau_async_push ($_POST['ref'],
@@ -531,12 +532,11 @@ elseif (isset ($_GET['end_async']))
 {
     if (!isset ($_POST['ref'])
         || !isset ($_POST['code']))
-        echo "Error";
+        echo 'Error';
     else
         echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
 }
 else
-    echo "Error";
+    echo 'Error';
 exit;
 ?>
-