Jirafeau version 2.0.0

[jirafeau_mojo42.git] / script.php

diff --git a/script.php b/script.php
index d8394d15743797ba8da9ee2b5f647c75b9a2dcb7..c3b722f82518bd1a479ee025fd5819ad7a500aa6 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
  *  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/>.

  */
 
 /*
  */
 
 /*


@@ -22,10 +22,8 @@
  * If you don't want this feature, you can simply delete this file from your
  * web directory.
  */
  * If you don't want this feature, you can simply delete this file from your
  * web directory.
  */

-

 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 

-require (JIRAFEAU_ROOT . 'lib/config.original.php');

 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');


@@ -55,6 +53,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


@@ -63,12 +62,12 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
 }
 
 /* Lets use interface now. */
 }
 
 /* Lets use interface now. */

-header('Content-Type: text; charset=utf-8');
+header('Content-Type: text/plain; charset=utf-8');

 
 check_errors ($cfg);
 if (has_error ())
 {
 
 check_errors ($cfg);
 if (has_error ())
 {

-    echo "Error";
+    echo 'Error 1';

     exit;
 }
 
     exit;
 }
 


@@ -78,7 +77,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
 {
     if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
     {
 {
     if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
     {

-        echo "Error";
+        echo 'Error 2';

         exit;
     }
 
         exit;
     }
 


@@ -86,7 +85,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {

-        echo "Error";
+        echo 'Error 3';

         exit;
     }
 
         exit;
     }
 


@@ -97,7 +96,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     $time = time ();
     if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
     {
     $time = time ();
     if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
     {

-        echo "Error";
+        echo 'Error 4: The parameter time is invalid.';

         exit;
     }
     else
         exit;
     }
     else


@@ -118,6 +117,9 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;
             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;

+            case 'quarter':
+                $time += JIRAFEAU_QUARTER;
+                break;

             case 'year':
                 $time += JIRAFEAU_YEAR;
                 break;
             case 'year':
                 $time += JIRAFEAU_YEAR;
                 break;


@@ -130,7 +132,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     if ($cfg['maximal_upload_size'] > 0 &&
         $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
     {
     if ($cfg['maximal_upload_size'] > 0 &&
         $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
     {

-        echo "Error";
+        echo 'Error 5: Your file exceeds the maximum authorized file size.';

         exit;
     }
 
         exit;
     }
 


@@ -138,10 +140,10 @@ 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'])
     {
     if (empty($res) || $res['error']['has_error'])
     {

-        echo "Error";
+        echo 'Error 6 ' . $res['error']['why'];

         exit;
     }
     /* Print direct link. */
         exit;
     }
     /* Print direct link. */


@@ -162,17 +164,17 @@ 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))
     {
     if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {

-        echo "Error";
+        echo 'Error 7';

         exit;
     }
         exit;
     }

-    
+

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

-        echo "Error";
+        echo 'Error 8';

         exit;
     }
     if (strlen ($d) > 0 && $d == $link['link_code'])
         exit;
     }
     if (strlen ($d) > 0 && $d == $link['link_code'])


@@ -184,18 +186,19 @@ elseif (isset ($_GET['h']))
     if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
     {
         jirafeau_delete_link ($link_name);
     if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
     {
         jirafeau_delete_link ($link_name);

-        echo "Error";
+        echo 'Error 9';

         exit;
     }
     if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
     {
         exit;
     }
     if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
     {

-        echo "Error";
+        sleep (2);
+        echo 'Error 10';

         exit;
     }
     $p = s2p ($link['md5']);
     if (!file_exists (VAR_FILES . $p . $link['md5']))
     {
         exit;
     }
     $p = s2p ($link['md5']);
     if (!file_exists (VAR_FILES . $p . $link['md5']))
     {

-        echo "Error";
+        echo 'Error 11';

         exit;
     }
 
         exit;
     }
 


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

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

 
 

-# Config
-proxy='' # ex: proxy='proxysever.test.com:3128' or set JIRAFEAU_PROXY global variable
-url='<?php echo $cfg['web_root'] . 'script.php'; ?>' # or set JIRAFEAU_URL ex: url='http://mysite/jirafeau/script.php'
-time='none' # minute, hour, day, week, month, year or none. Or set JIRAFEAU_TIME.
-one_time='' # ex: one_time="1" or set JIRAFEAU_ONE_TIME.
-curl='' # curl path to download or set JIRAFEAU_CURL_PATH.
-# End of config
+# Config begin
+proxy='' # Or set JIRAFEAU_PROXY.
+url='<?php echo $cfg['web_root']; ?>' # Or set JIRAFEAU_URL.
+time='<?php echo $cfg['availability_default']; ?>' # Or set JIRAFEAU_TIME.
+one_time='' # Or set JIRAFEAU_ONE_TIME.
+curl='' # Or set JIRAFEAU_CURL_PATH.
+# Config end

 
 if [ -n "$JIRAFEAU_PROXY" ]; then
     proxy="$JIRAFEAU_PROXY"
 
 if [ -n "$JIRAFEAU_PROXY" ]; then
     proxy="$JIRAFEAU_PROXY"


@@ -287,17 +289,22 @@ if [ -z "$curl" ]; then
 fi
 
 if [ -z "$2" ]; then
 fi
 
 if [ -z "$2" ]; then

-    echo "man:"
-    echo "    $0 send PATH [PASSWORD]"
+    echo "Jirafeau Bash Script <?php echo JIRAFEAU_VERSION; ?>"
+    echo "--------------------------"
+    echo "Usage:"
+    echo "    $0 OPTIONS"
+    echo
+    echo "Options:"
+    echo "    $0 send FILE [PASSWORD]"

     echo "    $0 get URL [PASSWORD]"
     echo "    $0 delete URL"
     echo "    $0 get URL [PASSWORD]"
     echo "    $0 delete URL"

-    echo ""
+    echo

     echo "Global variables to export:"
     echo "Global variables to export:"

-    echo "    JIRAFEAU_PROXY : example: proxysever.test.com:3128"
-    echo "    JIRAFEAU_URL : example: http://mysite/jirafeau/script.php"
-    echo "    JIRAFEAU_TIME : minute, hour, day, week, year, month or none"
-    echo "    JIRAFEAU_ONE_TIME : set anything or set empty"
-    echo "    JIRAFEAU_CURL : path to your curl binary"
+    echo "    JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxysever.example.com:3128«"
+    echo "    JIRAFEAU_URL : URI to Jirafeau installation with trailing slash, eg. »https://example.com/jirafeau/«"
+    echo "    JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, »month«, »quarter«, »year« or »none«"
+    echo "    JIRAFEAU_ONE_TIME : self-destroy after first download, eg. »1« to enable or »« (empty) to disable"
+    echo "    JIRAFEAU_CURL : alternative path to curl binary"

 
     exit 0
 fi
 
     exit 0
 fi


@@ -317,6 +324,9 @@ if [ -n "$3" ]; then
     options="$options -F key=$password"
 fi
 
     options="$options -F key=$password"
 fi
 

+apipage='script.php'
+downloadpage='f.php'
+

 if [ "$1" == "send" ]; then
     if [ ! -f "$2" ]; then
         echo "File \"$2\" does not exists."
 if [ "$1" == "send" ]; then
     if [ ! -f "$2" ]; then
         echo "File \"$2\" does not exists."


@@ -327,10 +337,11 @@ if [ "$1" == "send" ]; then
     res=$($curl -X POST --http1.0 $proxy $options \
                   -F "time=$time" \
                   -F "file=@$2" \
     res=$($curl -X POST --http1.0 $proxy $options \
                   -F "time=$time" \
                   -F "file=@$2" \

-                  $url)
+                  $url$apipage)

 
 

-    if [[ "$res" == "Error" ]]; then
+    if [[ "$res" == Error* ]]; then

         echo "Error while uploading."
         echo "Error while uploading."

+        echo $res

         exit
     fi
 
         exit
     fi
 


@@ -347,8 +358,20 @@ if [ "$1" == "send" ]; then
         fi
         cnt=$(( cnt + 1 ))
         done)
         fi
         cnt=$(( cnt + 1 ))
         done)

-    echo "${url}?h=$code"
-    echo "${url}?h=$code&d=$del_code"
+
+    echo
+    echo "Download page:"
+    echo "    ${url}${downloadpage}?h=$code"
+    echo "Direct download:"
+    echo "    ${url}${downloadpage}?h=$code&d=1"
+    echo "Delete link:"
+    echo "    ${url}${downloadpage}?h=$code&d=$del_code"
+    echo
+    echo "Download via API:"
+    echo "    ${0} get ${url}${apipage}?h=$code [PASSWORD}"
+    echo "Delete via API:"
+    echo "    ${0} delete ${url}${downloadpage}?h=$code&d=$del_code"
+

 elif [ "$1" == "get" ]; then
     if [ -z "$password" ]; then
         $curl $proxy -OJ "$2"
 elif [ "$1" == "get" ]; then
     if [ -z "$password" ]; then
         $curl $proxy -OJ "$2"


@@ -362,7 +385,7 @@ fi
     }
     else
     {
     }
     else
     {

-        echo "Error";
+        echo 'Error 12';

         exit;
     }
 }
         exit;
     }
 }


@@ -372,7 +395,7 @@ elseif (isset ($_GET['alias_create']))
     $ip = get_ip_address($cfg);
     if (!jirafeau_challenge_upload_ip ($cfg, $ip))
     {
     $ip = get_ip_address($cfg);
     if (!jirafeau_challenge_upload_ip ($cfg, $ip))
     {

-        echo "Error";
+        echo 'Error 13';

         exit;
     }
 
         exit;
     }
 


@@ -380,7 +403,7 @@ elseif (isset ($_GET['alias_create']))
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {

-        echo "Error";
+        echo 'Error 14';

         exit;
     }
 
         exit;
     }
 


@@ -388,7 +411,7 @@ elseif (isset ($_GET['alias_create']))
         !isset ($_POST['destination']) ||
         !isset ($_POST['password']))
     {
         !isset ($_POST['destination']) ||
         !isset ($_POST['password']))
     {

-        echo "Error";
+        echo 'Error 15';

         exit;
     }
 
         exit;
     }
 


@@ -402,7 +425,7 @@ elseif (isset ($_GET['alias_get']))
 {
     if (!isset ($_POST['alias']))
     {
 {
     if (!isset ($_POST['alias']))
     {

-        echo "Error";
+        echo 'Error 16';

         exit;
     }
 
         exit;
     }
 


@@ -415,7 +438,7 @@ elseif (isset ($_GET['alias_update']))
         !isset ($_POST['destination']) ||
         !isset ($_POST['password']))
     {
         !isset ($_POST['destination']) ||
         !isset ($_POST['password']))
     {

-        echo "Error";
+        echo 'Error 17';

         exit;
     }
 
         exit;
     }
 


@@ -435,7 +458,7 @@ elseif (isset ($_GET['alias_delete']))
     if (!isset ($_POST['alias']) ||
         !isset ($_POST['password']))
     {
     if (!isset ($_POST['alias']) ||
         !isset ($_POST['password']))
     {

-        echo "Error";
+        echo 'Error 18';

         exit;
     }
 
         exit;
     }
 


@@ -447,7 +470,7 @@ elseif (isset ($_GET['init_async']))
 {
     if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
     {
 {
     if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
     {

-        echo "Error";
+        echo 'Error 19';

         exit;
     }
 
         exit;
     }
 


@@ -455,20 +478,20 @@ elseif (isset ($_GET['init_async']))
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {

-        echo "Error";
+        echo 'Error 20';

         exit;
     }
 
     if (!isset ($_POST['filename']))
     {
         exit;
     }
 
     if (!isset ($_POST['filename']))
     {

-        echo "Error";
+        echo 'Error 21';

         exit;
     }
 
     $type = '';
     if (isset ($_POST['type']))
         $type = $_POST['type'];
         exit;
     }
 
     $type = '';
     if (isset ($_POST['type']))
         $type = $_POST['type'];

-    
+

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


@@ -476,7 +499,7 @@ elseif (isset ($_GET['init_async']))
     $time = time ();
     if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
     {
     $time = time ();
     if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
     {

-        echo "Error";
+        echo 'Error 22';

         exit;
     }
     else
         exit;
     }
     else


@@ -497,6 +520,9 @@ elseif (isset ($_GET['init_async']))
             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;
             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;

+            case 'quarter':
+                $time += JIRAFEAU_QUARTER;
+                break;

             case 'year':
                 $time += JIRAFEAU_YEAR;
                 break;
             case 'year':
                 $time += JIRAFEAU_YEAR;
                 break;


@@ -517,7 +543,7 @@ elseif (isset ($_GET['push_async']))
     if ((!isset ($_POST['ref']))
         || (!isset ($_FILES['data']))
         || (!isset ($_POST['code'])))
     if ((!isset ($_POST['ref']))
         || (!isset ($_FILES['data']))
         || (!isset ($_POST['code'])))

-        echo "Error";
+        echo 'Error 23';

     else
     {
         echo jirafeau_async_push ($_POST['ref'],
     else
     {
         echo jirafeau_async_push ($_POST['ref'],


@@ -531,12 +557,11 @@ elseif (isset ($_GET['end_async']))
 {
     if (!isset ($_POST['ref'])
         || !isset ($_POST['code']))
 {
     if (!isset ($_POST['ref'])
         || !isset ($_POST['code']))

-        echo "Error";
+        echo 'Error 24';

     else
         echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
 }
 else
     else
         echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
 }
 else

-    echo "Error";
+    echo 'Error 25';

 exit;
 ?>
 exit;
 ?>

-