[FEATURE] Contribution guide: Revise structure

[jirafeau_project.git] / script.php

diff --git a/script.php b/script.php
index 17173e949928af2e4cff84deec2c02adc19bdd89..9da9221084f87d96d935bbc0808a5c348b081791 100644 (file)
--- a/script.php
+++ b/script.php
@@ -1,7 +1,7 @@
 <?php
 /*
  *  Jirafeau, your web file repository
 <?php
 /*
  *  Jirafeau, your web file repository

- *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -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');


@@ -50,154 +48,26 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
         require (JIRAFEAU_ROOT . 'lib/template/footer.php');
         exit;
     }
         require (JIRAFEAU_ROOT . 'lib/template/footer.php');
         exit;
     }

-    echo '<div class="info">';
-    echo '<h2>' . t('Welcome to Jirafeau\'s query interface') . '</h2>';
-    echo '<p>';
-    echo t('This interface permits to script your uploads and downloads.') .
-            ' ' . t('The instructions above show how to query this interface.');
-    echo '</p>';
-    
-    echo '<h3>' . t('Get Jirafeau\'s version') . ':</h3>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>get_version=</b>1<i> (" . t('Required') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return brut text content.') . ' ' .
-            t('First line is the version number.') . '<br /></p>';
-    echo '<p>';
-    echo t('Example') . ": <a href=\"" . $web_root . "script.php?get_version=1\">" . $web_root . "script.php?get_version=1</a> ";
-    echo '</p>';
-
-    echo '<h3>' . t('Get server capacity') . ':</h3>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>get_capacity=</b>1<i> (" . t('Required') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return brut text content.') . ' ' .
-            t('First line is the server capacity (in Bytes).') . '<br /></p>';
-    echo '<p>';
-    echo t('Example') . ": <a href=\"" . $web_root . "script.php?get_capacity=1\">" . $web_root . "script.php?get_capacity=1</a> ";
-    echo '</p>';
-    
-    echo '<h3>' . t('Upload a file') . ':</h3>';
-    echo '<p>';
-    echo t('Send a POST query to') . ': <i>' . $web_root . 'script.php</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>file=</b>C:\\your\\file\\path<i> (" . t('Required') . ")</i> <br />";
-    echo "<b>time=</b>[minute|hour|day|week|month|none]<i> (" . t('Optional') . ', '. t('default: none') . ")</i> <br />";
-    echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />";
-    echo "<b>one_time_download=</b>1<i> (" . t('Optional') . ")</i> <br />";
-    echo "<b>upload_password=</b>your_upload_password<i> (" . t('Optional') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return brut text content.') . ' ' .
-         t('First line is the download reference and the second line the delete code.') . '<br /></p>';
-    
-    echo '<h3>' . t('Get a file') . ':</h3>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>h=</b>your_download_reference<i> (" . t('Required') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>';
-    echo t('If a password has been set, send a POST request with it.');
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>';
-    echo t('Example') . ": <a href=\"" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU\">" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU</a> ";
-    echo '</p>';
-    
-    echo '<h3>' . t('Delete a file') . ':</h3>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>h=</b>your_download_reference<i> (" . t('Required') . ")</i> <br />";
-    echo "<b>d=</b>yout_delete_code<i> (" . t('Required') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return "Ok" if succeded, "Error" otherwhise.') . '<br /></p>';
-    echo '<p>';
-    echo t('Example') . ": <a href=\"" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU&amp;d=0d210a952\">" . $web_root . "script.php?h=30ngy0hsDcpfrF8zR7x9iU&amp;d=0d210a952</a> ";
-    echo '</p>';
-    
-    echo '<h3>' . t('Get a generated scripts') . ':</h3>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>lang=</b>[";
-    foreach ($script_langages as $lang => $name)
-        echo $lang;
-    echo "]<i> (" . t('Required') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return brut text content of the code.') . '<br /></p>';
-    echo '<p>';
-    echo t('Example') . ": <br />";
-    foreach ($script_langages as $lang => $name)
-        echo "$name: <a href=\"" . $web_root . "script.php?lang=$lang\">" . $web_root . "script.php?lang=$lang</a> ";
-    echo '</p>';
-    
-    echo '<h3>' . t('Initalize an asynchronous transfert') . ':</h3>';
-    echo '<p>';
-    echo t('The goal is to permit to transfert big file, chunk by chunk.') . ' ';
-    echo t('Chunks of data must be sent in order.');
-    echo '</p>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?init_async</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>filename=</b>file_name.ext<i> (" . t('Required') . ")</i> <br />";
-    echo "<b>type=</b>MIME_TYPE<i> (" . t('Optional') . ")</i> <br />";
-    echo "<b>time=</b>[minute|hour|day|week|month|none]<i> (" . t('Optional') . ', '. t('default: none') . ")</i> <br />";
-    echo "<b>password=</b>your_password<i> (" . t('Optional') . ")</i> <br />";
-    echo "<b>one_time_download=</b>1<i> (" . t('Optional') . ")</i> <br />";
-    echo "<b>upload_password=</b>your_upload_password<i> (" . t('Optional') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return brut text content.') . ' ' .
-         t('First line is the asynchronous transfert reference and the second line the code to use in the next operation.') . '<br /></p>';
-
-    echo '<h3>' . t('Push data during asynchronous transfert') . ':</h3>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?push_async</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>ref=</b>async_reference<i> (" . t('Required') . ")</i> <br />";
-    echo "<b>data=</b>data_chunk<i> (" . t('Required') . ")</i> <br />";
-    echo "<b>code=</b>last_provided_code<i> (" . t('Required') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return brut text content.') . ' ' .
-         t('Returns the next code to use.') . '<br /></p>';
-
-    echo '<h3>' . t('Finalize asynchronous transfert') . ':</h3>';
-    echo '<p>';
-    echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?end_async</i><br />';
-    echo '<br />';
-    echo t('Parameters') . ':<br />';
-    echo "<b>ref=</b>async_reference<i> (" . t('Required') . ")</i> <br />";
-    echo "<b>code=</b>last_provided_code<i> (" . t('Required') . ")</i> <br />";
-    echo '</p>';
-    echo '<p>' . t('This will return brut text content.') . ' ' .
-         t('First line is the download reference and the second line the delete code.') . '<br /></p>';
-
-    echo '</div><br />';
+    ?>
+    <div class="info">
+    <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>You may download a preconfigured <a href="<?php echo JIRAFEAU_ABSPREFIX . 'script.php?lang=bash'; ?>">Bash Script</a> to easily send to and get files from the API via command line.</p>
+    </div>
+    <br />
+    <?php

     require (JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
 
 /* Lets use interface now. */
     require (JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
 
 /* 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;
 }
 


@@ -205,11 +75,17 @@ if (has_error ())
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     && is_writable (VAR_LINKS))
 {
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     && is_writable (VAR_LINKS))
 {

+    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+    {
+        echo 'Error 2';
+        exit;
+    }
+

     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {

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

         exit;
     }
 
         exit;
     }
 


@@ -218,8 +94,11 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
         $key = $_POST['key'];
 
     $time = time ();
         $key = $_POST['key'];
 
     $time = time ();

-    if (!isset ($_POST['time']))
-        $time = JIRAFEAU_INFINITY;
+    if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
+    {
+        echo 'Error 4: The parameter time is invalid.';
+        exit;
+    }

     else
         switch ($_POST['time'])
         {
     else
         switch ($_POST['time'])
         {


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

-            default:
+            case 'quarter':
+                $time += JIRAFEAU_QUARTER;
+                break;
+            case 'year':
+                $time += JIRAFEAU_YEAR;
+                break;
+           default:

                 $time = JIRAFEAU_INFINITY;
                 break;
         }
                 $time = JIRAFEAU_INFINITY;
                 break;
         }

+
+    // Check file size
+    if ($cfg['maximal_upload_size'] > 0 &&
+        $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
+    {
+        echo 'Error 5: Your file exceeds the maximum authorized file size.';
+        exit;
+    }
+

     $res = jirafeau_upload ($_FILES['file'],
                             isset ($_POST['one_time_download']),
     $res = jirafeau_upload ($_FILES['file'],
                             isset ($_POST['one_time_download']),

-                            $key, $time, $_SERVER['REMOTE_ADDR'],
-                            $cfg['enable_crypt'], $cfg['link_name_lenght']);
-    
+                            $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. */


@@ -270,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'])


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


@@ -330,6 +225,10 @@ elseif (isset ($_GET['get_capacity']))
     echo min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
               jirafeau_ini_to_bytes (ini_get ('upload_max_filesize')));
 }
     echo min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
               jirafeau_ini_to_bytes (ini_get ('upload_max_filesize')));
 }

+elseif (isset ($_GET['get_maximal_upload_size']))
+{
+    echo $cfg['maximal_upload_size'];
+}

 elseif (isset ($_GET['get_version']))
 {
     echo JIRAFEAU_VERSION;
 elseif (isset ($_GET['get_version']))
 {
     echo JIRAFEAU_VERSION;


@@ -342,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 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"


@@ -391,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, 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


@@ -421,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."


@@ -431,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
 


@@ -451,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"


@@ -466,38 +385,123 @@ fi
     }
     else
     {
     }
     else
     {

-        echo "Error";
+        echo 'Error 12';
+        exit;
+    }
+}
+/* Create alias. */
+elseif (isset ($_GET['alias_create']))
+{
+    $ip = get_ip_address($cfg);
+    if (!jirafeau_challenge_upload_ip ($cfg, $ip))
+    {
+        echo 'Error 13';
+        exit;
+    }
+
+    if (jirafeau_has_upload_password ($cfg) &&
+         (!isset ($_POST['upload_password']) ||
+          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
+    {
+        echo 'Error 14';

         exit;
     }
         exit;
     }

+
+    if (!isset ($_POST['alias']) ||
+        !isset ($_POST['destination']) ||
+        !isset ($_POST['password']))
+    {
+        echo 'Error 15';
+        exit;
+    }
+
+    echo jirafeau_alias_create ($_POST['alias'],
+                                $_POST['destination'],
+                                $_POST['password'],
+                                $ip);
+}
+/* Get alias. */
+elseif (isset ($_GET['alias_get']))
+{
+    if (!isset ($_POST['alias']))
+    {
+        echo 'Error 16';
+        exit;
+    }
+
+    echo jirafeau_alias_get ($_POST['alias']);
+}
+/* Update alias. */
+elseif (isset ($_GET['alias_update']))
+{
+    if (!isset ($_POST['alias']) ||
+        !isset ($_POST['destination']) ||
+        !isset ($_POST['password']))
+    {
+        echo 'Error 17';
+        exit;
+    }
+
+    $new_password = '';
+    if (isset ($_POST['new_password']))
+        $new_password = $_POST['new_password'];
+
+    echo jirafeau_alias_update ($_POST['alias'],
+                                $_POST['destination'],
+                                $_POST['password'],
+                                $new_password,
+                                get_ip_address($cfg));
+}
+/* Delete alias. */
+elseif (isset ($_GET['alias_delete']))
+{
+    if (!isset ($_POST['alias']) ||
+        !isset ($_POST['password']))
+    {
+        echo 'Error 18';
+        exit;
+    }
+
+    echo jirafeau_alias_delete ($_POST['alias'],
+                                $_POST['password']);

 }
 /* Initialize an asynchronous upload. */
 elseif (isset ($_GET['init_async']))
 {
 }
 /* Initialize an asynchronous upload. */
 elseif (isset ($_GET['init_async']))
 {

+    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
+    {
+        echo 'Error 19';
+        exit;
+    }
+

     if (jirafeau_has_upload_password ($cfg) &&
          (!isset ($_POST['upload_password']) ||
           !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
     {
     if (jirafeau_has_upload_password ($cfg) &&
          (!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'];
 
     $time = time ();
     $key = '';
     if (isset ($_POST['key']))
         $key = $_POST['key'];
 
     $time = time ();

-    if (!isset ($_POST['time']))
-        $time = JIRAFEAU_INFINITY;
+    if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
+    {
+        echo 'Error 22';
+        exit;
+    }

     else
         switch ($_POST['time'])
         {
     else
         switch ($_POST['time'])
         {


@@ -516,6 +520,12 @@ 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;

             default:
                 $time = JIRAFEAU_INFINITY;
                 break;
             default:
                 $time = JIRAFEAU_INFINITY;
                 break;


@@ -525,7 +535,7 @@ elseif (isset ($_GET['init_async']))
                               isset ($_POST['one_time_download']),
                               $key,
                               $time,
                               isset ($_POST['one_time_download']),
                               $key,
                               $time,

-                              $_SERVER['REMOTE_ADDR']);
+                              get_ip_address($cfg));

 }
 /* Continue an asynchronous upload. */
 elseif (isset ($_GET['push_async']))
 }
 /* Continue an asynchronous upload. */
 elseif (isset ($_GET['push_async']))


@@ -533,20 +543,25 @@ 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
     else

-        echo jirafeau_async_push ($_POST['ref'], $_FILES['data'], $_POST['code']);                                      
+    {
+        echo jirafeau_async_push ($_POST['ref'],
+                                  $_FILES['data'],
+                                  $_POST['code'],
+                                  $cfg['maximal_upload_size']);
+    }

 }
 /* Finalize an asynchronous upload. */
 elseif (isset ($_GET['end_async']))
 {
     if (!isset ($_POST['ref'])
         || !isset ($_POST['code']))
 }
 /* Finalize an asynchronous upload. */
 elseif (isset ($_GET['end_async']))
 {
     if (!isset ($_POST['ref'])
         || !isset ($_POST['code']))

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

     else
     else

-        echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_lenght']);
+        echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);

 }
 else
 }
 else

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

 exit;
 ?>
 exit;
 ?>