Add note about admin password hashing

[jirafeau.git] / script.php

diff --git a/script.php b/script.php
index d1719a3fe472824806728ba1d50bbf0c1b9a0445..c5adf95cd648b838c2200ba3fd6603ad6533d08f 100644 (file)
--- a/script.php
+++ b/script.php
@@ -69,7 +69,7 @@ header('Content-Type: text; charset=utf-8');
 check_errors ($cfg);
 if (has_error ())
 {
 check_errors ($cfg);
 if (has_error ())
 {

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

     exit;
 }
 
     exit;
 }
 


@@ -79,7 +79,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;
     }
 


@@ -87,7 +87,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;
     }
 


@@ -98,7 +98,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


@@ -119,6 +119,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;


@@ -131,7 +134,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;
     }
 


@@ -142,7 +145,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
 
     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. */


@@ -166,14 +169,14 @@ elseif (isset ($_GET['h']))
 
     if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {
 
     if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {

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

         exit;
     }
 
     $link = jirafeau_get_link ($link_name);
     if (count ($link) == 0)
     {
         exit;
     }
 
     $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'])


@@ -185,19 +188,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'])
     {
         sleep (2);
         exit;
     }
     if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
     {
         sleep (2);

-        echo 'Error';
+        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;
     }
 


@@ -246,7 +249,7 @@ elseif (isset ($_GET['lang']))
 # 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'
 # 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.
+time='<?php echo $cfg['availability_default']; ?>' # minute, hour, day, week, month, quarted, 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
 one_time='' # ex: one_time="1" or set JIRAFEAU_ONE_TIME.
 curl='' # curl path to download or set JIRAFEAU_CURL_PATH.
 # End of config


@@ -297,7 +300,7 @@ if [ -z "$2" ]; then
     echo "Global variables to export:"
     echo "    JIRAFEAU_PROXY : example: proxysever.test.com:3128"
     echo "    JIRAFEAU_URL : example: http://mysite/jirafeau/script.php"
     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_TIME : minute, hour, day, week, quarter, year, month or none"

     echo "    JIRAFEAU_ONE_TIME : set anything or set empty"
     echo "    JIRAFEAU_CURL : path to your curl binary"
 
     echo "    JIRAFEAU_ONE_TIME : set anything or set empty"
     echo "    JIRAFEAU_CURL : path to your curl binary"
 


@@ -331,8 +334,9 @@ if [ "$1" == "send" ]; then
                   -F "file=@$2" \
                   $url)
 
                   -F "file=@$2" \
                   $url)
 

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

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

+        echo $res

         exit
     fi
 
         exit
     fi
 


@@ -349,7 +353,11 @@ if [ "$1" == "send" ]; then
         fi
         cnt=$(( cnt + 1 ))
         done)
         fi
         cnt=$(( cnt + 1 ))
         done)

+    echo "Download link:"

     echo "${url}?h=$code"
     echo "${url}?h=$code"

+    echo "Direct download link:"
+    echo "${url}?h=$code&d=1"
+    echo "Delete link:"

     echo "${url}?h=$code&d=$del_code"
 elif [ "$1" == "get" ]; then
     if [ -z "$password" ]; then
     echo "${url}?h=$code&d=$del_code"
 elif [ "$1" == "get" ]; then
     if [ -z "$password" ]; then


@@ -364,7 +372,7 @@ fi
     }
     else
     {
     }
     else
     {

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

         exit;
     }
 }
         exit;
     }
 }


@@ -374,7 +382,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;
     }
 


@@ -382,7 +390,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;
     }
 


@@ -390,7 +398,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;
     }
 


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

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

         exit;
     }
 
         exit;
     }
 


@@ -417,7 +425,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;
     }
 


@@ -437,7 +445,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;
     }
 


@@ -449,7 +457,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;
     }
 


@@ -457,13 +465,13 @@ 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;
     }
 
         exit;
     }
 


@@ -478,7 +486,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


@@ -499,6 +507,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;


@@ -519,7 +530,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'],


@@ -533,11 +544,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;
 ?>