Merge remote-tracking branch 'origin/master'

[jirafeau_project.git] / script.php

diff --git a/script.php b/script.php
index cafd10c10dbc6d793a7d522996c028cdf588bff0..d1719a3fe472824806728ba1d50bbf0c1b9a0445 100644 (file)
--- a/script.php
+++ b/script.php
@@ -55,6 +55,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     <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 get available calls :)</p>
     <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 get available calls :)</p>

+    <p>Alternatively, go to <a href="<?php echo $cfg['web_root'] . 'script.php?lang=bash'; ?>">this page</a> to download a bash script.</p>

     </div>
     <br />
     <?php
     </div>
     <br />
     <?php


@@ -138,7 +139,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
                             isset ($_POST['one_time_download']),
                             $key, $time, get_ip_address($cfg),
                             $cfg['enable_crypt'], $cfg['link_name_length']);
                             isset ($_POST['one_time_download']),
                             $key, $time, get_ip_address($cfg),
                             $cfg['enable_crypt'], $cfg['link_name_length']);

-    
+

     if (empty($res) || $res['error']['has_error'])
     {
         echo 'Error';
     if (empty($res) || $res['error']['has_error'])
     {
         echo 'Error';


@@ -162,13 +163,13 @@ elseif (isset ($_GET['h']))
     $d = '';
     if (isset ($_GET['d']))
         $d = $_GET['d'];
     $d = '';
     if (isset ($_GET['d']))
         $d = $_GET['d'];

-    
+

     if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {
         echo 'Error';
         exit;
     }
     if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {
         echo 'Error';
         exit;
     }

-    
+

     $link = jirafeau_get_link ($link_name);
     if (count ($link) == 0)
     {
     $link = jirafeau_get_link ($link_name);
     if (count ($link) == 0)
     {


@@ -189,6 +190,7 @@ elseif (isset ($_GET['h']))
     }
     if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
     {
     }
     if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
     {

+        sleep (2);

         echo 'Error';
         exit;
     }
         echo 'Error';
         exit;
     }


@@ -238,7 +240,7 @@ elseif (isset ($_GET['lang']))
 ?>
 #!/bin/bash
 
 ?>
 #!/bin/bash
 

-# This script has been auto-generated by Jirafeau but you can still edit 
+# This script has been auto-generated by Jirafeau but you can still edit

 # options below.
 
 # Config
 # options below.
 
 # Config


@@ -468,7 +470,7 @@ elseif (isset ($_GET['init_async']))
     $type = '';
     if (isset ($_POST['type']))
         $type = $_POST['type'];
     $type = '';
     if (isset ($_POST['type']))
         $type = $_POST['type'];

-    
+

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