Fix missing quarter in possible values

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
old mode 100755 (executable)
new mode 100644 (file)
index 223fd8e..5c0c45f
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -2,7 +2,8 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>

- *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Nicola Spanti (RyDroid) <dev@nicola-spanti.info>

  *
  *  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


@@ -15,12 +16,12 @@
  *  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/>.

  */
 
 /**
  * Transform a string in a path by seperating each letters by a '/'.
  */
 
 /**
  * Transform a string in a path by seperating each letters by a '/'.

-  * @return path finishing with a '/'
+ * @return path finishing with a '/'

  */
 function
 s2p ($s)
  */
 function
 s2p ($s)


@@ -39,29 +40,29 @@ function
 base_16_to_64 ($num)
 {
     $m = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_';
 base_16_to_64 ($num)
 {
     $m = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_';

-    $hex2bin = array ('0000', # 0
-                      '0001', # 1
-                      '0010', # 2
-                      '0011', # 3
-                      '0100', # 4
-                      '0101', # 5
-                      '0110', # 6
-                      '0111', # 7
-                      '1000', # 8
-                      '1001', # 9
-                      '1010', # a
-                      '1011', # b
-                      '1100', # c
-                      '1101', # d
-                      '1110', # e
-                      '1111'); # f
-    $o = '';    
+    $hex2bin = array ('0000',  # 0
+                      '0001',  # 1
+                      '0010',  # 2
+                      '0011',  # 3
+                      '0100',  # 4
+                      '0101',  # 5
+                      '0110',  # 6
+                      '0111',  # 7
+                      '1000',  # 8
+                      '1001',  # 9
+                      '1010',  # a
+                      '1011',  # b
+                      '1100',  # c
+                      '1101',  # d
+                      '1110',  # e
+                      '1111'); # f
+    $o = '';

     $b = '';
     $i = 0;
     # Convert long hex string to bin.
     $size = strlen ($num);
     $b = '';
     $i = 0;
     # Convert long hex string to bin.
     $size = strlen ($num);

-
-    $b .= $hex2bin{hexdec ($num{$i})};
+    for ($i = 0; $i < $size; $i++)
+        $b .= $hex2bin{hexdec ($num{$i})};

     # Convert long bin to base 64.
     $size *= 4;
     for ($i = $size - 6; $i >= 0; $i -= 6)
     # Convert long bin to base 64.
     $size *= 4;
     for ($i = $size - 6; $i >= 0; $i -= 6)


@@ -90,6 +91,21 @@ jirafeau_gen_random ($l)
     return $code;
 }
 
     return $code;
 }
 

+function
+is_ssl() {
+    if ( isset($_SERVER['HTTPS']) ) {
+        if ( 'on' == strtolower($_SERVER['HTTPS']) ||
+             '1' == $_SERVER['HTTPS'] )
+            return true;
+    } elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+        return true;
+    } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+        if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
+            return true;
+    }
+    return false;
+}
+

 function
 jirafeau_human_size ($octets)
 {
 function
 jirafeau_human_size ($octets)
 {


@@ -98,7 +114,7 @@ jirafeau_human_size ($octets)
     $p = min (floor (($o ? log ($o) : 0) / log (1024)), count ($u) - 1);
     $o /= pow (1024, $p);
     return round ($o, 1) . $u[$p];
     $p = min (floor (($o ? log ($o) : 0) / log (1024)), count ($u) - 1);
     $o /= pow (1024, $p);
     return round ($o, 1) . $u[$p];

-} 
+}

 
 function
 jirafeau_clean_rm_link ($link)
 
 function
 jirafeau_clean_rm_link ($link)


@@ -111,7 +127,7 @@ jirafeau_clean_rm_link ($link)
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.

-           && basename ($parse) != basename (VAR_LINKS)) 
+           && basename ($parse) != basename (VAR_LINKS))

     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);


@@ -122,16 +138,17 @@ function
 jirafeau_clean_rm_file ($md5)
 {
     $p = s2p ("$md5");
 jirafeau_clean_rm_file ($md5)
 {
     $p = s2p ("$md5");

-    if (file_exists (VAR_FILES . $p . $md5))
-        unlink (VAR_FILES . $p . $md5);
-    if (file_exists (VAR_FILES . $p . $md5 . '_count'))
-        unlink (VAR_FILES . $p . $md5 . '_count');
+    $f = VAR_FILES . $p . $md5;
+    if (file_exists ($f) && is_file ($f))
+        unlink ($f);
+    if (file_exists ($f . '_count') && is_file ($f . '_count'))
+        unlink ($f . '_count');

     $parse = VAR_FILES . $p;
     $scan = array();
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.
     $parse = VAR_FILES . $p;
     $scan = array();
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.

-           && basename ($parse) != basename (VAR_FILES)) 
+           && basename ($parse) != basename (VAR_FILES))

     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);


@@ -143,7 +160,8 @@ jirafeau_clean_rm_file ($md5)
  * @param $value the value from php.ini
  * @returns an integer for this value
  */
  * @param $value the value from php.ini
  * @returns an integer for this value
  */

-function jirafeau_ini_to_bytes ($value)
+function
+jirafeau_ini_to_bytes ($value)

 {
     $modifier = substr ($value, -1);
     $bytes = substr ($value, 0, -1);
 {
     $modifier = substr ($value, -1);
     $bytes = substr ($value, 0, -1);


@@ -159,8 +177,6 @@ function jirafeau_ini_to_bytes ($value)
         $bytes *= 1024;
     case 'K':
         $bytes *= 1024;
         $bytes *= 1024;
     case 'K':
         $bytes *= 1024;

-    default:
-        break;

     }
     return $bytes;
 }
     }
     return $bytes;
 }


@@ -201,23 +217,16 @@ jirafeau_upload_errstr ($code)
     case UPLOAD_ERR_INI_SIZE:
     case UPLOAD_ERR_FORM_SIZE:
         return t('Your file exceeds the maximum authorized file size. ');
     case UPLOAD_ERR_INI_SIZE:
     case UPLOAD_ERR_FORM_SIZE:
         return t('Your file exceeds the maximum authorized file size. ');

-        break;

 
     case UPLOAD_ERR_PARTIAL:
     case UPLOAD_ERR_NO_FILE:
         return
 
     case UPLOAD_ERR_PARTIAL:
     case UPLOAD_ERR_NO_FILE:
         return

-            t
-            ('Your file was not uploaded correctly. You may succeed in retrying. ');
-        break;
+            t('Your file was not uploaded correctly. You may succeed in retrying. ');

 
     case UPLOAD_ERR_NO_TMP_DIR:
     case UPLOAD_ERR_CANT_WRITE:
     case UPLOAD_ERR_EXTENSION:
         return t('Internal error. You may not succeed in retrying. ');
 
     case UPLOAD_ERR_NO_TMP_DIR:
     case UPLOAD_ERR_CANT_WRITE:
     case UPLOAD_ERR_EXTENSION:
         return t('Internal error. You may not succeed in retrying. ');

-        break;
-
-    default:
-        break;

     }
     return t('Unknown error. ');
 }
     }
     return t('Unknown error. ');
 }


@@ -275,7 +284,7 @@ jirafeau_delete_file ($md5)
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;

-            
+

             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */
             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */


@@ -291,7 +300,7 @@ jirafeau_delete_file ($md5)
                 {
                     $count++;
                     jirafeau_delete_link ($node);
                 {
                     $count++;
                     jirafeau_delete_link ($node);

-                }   
+                }

             }
         }
     }
             }
         }
     }


@@ -306,13 +315,15 @@ jirafeau_delete_file ($md5)
  * @param $key if not empty, protect the file with this key
  * @param $time the time of validity of the file
  * @param $ip uploader's ip
  * @param $key if not empty, protect the file with this key
  * @param $time the time of validity of the file
  * @param $ip uploader's ip

+ * @param $crypt boolean asking to crypt or not
+ * @param $link_name_length size of the link name

  * @returns an array containing some information
  *   'error' => information on possible errors
  *   'link' => the link name of the uploaded file
  *   'delete_link' => the link code to delete file
  */
 function
  * @returns an array containing some information
  *   'error' => information on possible errors
  *   'link' => the link name of the uploaded file
  *   'delete_link' => the link code to delete file
  */
 function

-jirafeau_upload ($file, $one_time_download, $key, $time, $ip)
+jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length)

 {
     if (empty ($file['tmp_name']) || !is_uploaded_file ($file['tmp_name']))
     {
 {
     if (empty ($file['tmp_name']) || !is_uploaded_file ($file['tmp_name']))
     {


@@ -327,6 +338,18 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip)
     /* array representing no error */
     $noerr = array ('has_error' => false, 'why' => '');
 
     /* array representing no error */
     $noerr = array ('has_error' => false, 'why' => '');
 

+    /* Crypt file if option is enabled. */
+    $crypted = false;
+    $crypt_key = '';
+    if ($crypt == true && !(extension_loaded('mcrypt') == true))
+        error_log ("PHP extension mcrypt not loaded, won't encrypt in Jirafeau");
+    if ($crypt == true && extension_loaded('mcrypt') == true)
+    {
+        $crypt_key = jirafeau_encrypt_file ($file['tmp_name'], $file['tmp_name']);
+        if (strlen($crypt_key) > 0)
+            $crypted = true;
+    }
+

     /* file informations */
     $md5 = md5_file ($file['tmp_name']);
     $name = str_replace (NL, '', trim ($file['name']));
     /* file informations */
     $md5 = md5_file ($file['tmp_name']);
     $name = str_replace (NL, '', trim ($file['name']));


@@ -368,29 +391,29 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip)
     fclose ($handle);
 
     /* Create delete code. */
     fclose ($handle);
 
     /* Create delete code. */

-    $delete_link_code = jirafeau_gen_random (8);
+    $delete_link_code = jirafeau_gen_random (5);

 
 

-    /* md5 password or empty */
+    /* md5 password or empty. */

     $password = '';
     if (!empty ($key))
         $password = md5 ($key);
 
     /* create link file */
     $password = '';
     if (!empty ($key))
         $password = md5 ($key);
 
     /* create link file */

-    $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . ' .tmp';
+    $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . '.tmp';

     $handle = fopen ($link_tmp_name, 'w');
     fwrite ($handle,
             $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
             NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . date ('U') .
     $handle = fopen ($link_tmp_name, 'w');
     fwrite ($handle,
             $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
             NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . date ('U') .

-            NL . $ip . NL. $delete_link_code . NL);
+            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O'));

     fclose ($handle);
     fclose ($handle);

-    $md5_link = base_16_to_64 (md5_file ($link_tmp_name));
+    $md5_link = substr(base_16_to_64 (md5_file ($link_tmp_name)), 0, $link_name_length);

     $l = s2p ("$md5_link");
     if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
         !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
     {
         if (file_exists ($link_tmp_name))
             unlink ($link_tmp_name);
     $l = s2p ("$md5_link");
     if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
         !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
     {
         if (file_exists ($link_tmp_name))
             unlink ($link_tmp_name);

-        
+

         $counter--;
         if ($counter >= 1)
         {
         $counter--;
         if ($counter >= 1)
         {


@@ -402,20 +425,21 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip)
         {
             jirafeau_clean_rm_file ($md5_link);
         }
         {
             jirafeau_clean_rm_file ($md5_link);
         }

-        return (array(
+        return array(

                  'error' =>
                    array ('has_error' => true,
                           'why' => t('Internal error during file creation. ')),
                  'link' =>'',
                  'error' =>
                    array ('has_error' => true,
                           'why' => t('Internal error during file creation. ')),
                  'link' =>'',

-                 'delete_link' => ''));
+                 'delete_link' => '');

     }
     }

-   return (array ('error' => $noerr,
+   return array ( 'error' => $noerr,

                   'link' => $md5_link,
                   'link' => $md5_link,

-                  'delete_link' => $delete_link_code));
+                  'delete_link' => $delete_link_code,
+                  'crypt_key' => $crypt_key);

 }
 
 /**
 }
 
 /**

- * tells if a mime-type is viewable in a browser
+ * Tells if a mime-type is viewable in a browser

  * @param $mime the mime type
  * @returns a boolean telling if a mime type is viewable
  */
  * @param $mime the mime type
  * @returns a boolean telling if a mime type is viewable
  */


@@ -425,7 +449,7 @@ jirafeau_is_viewable ($mime)
     if (!empty ($mime))
     {
         /* Actually, verify if mime-type is an image or a text. */
     if (!empty ($mime))
     {
         /* Actually, verify if mime-type is an image or a text. */

-        $viewable = array ('image', 'text');
+        $viewable = array ('image', 'text', 'video', 'audio');

         $decomposed = explode ('/', $mime);
         return in_array ($decomposed[0], $viewable);
     }
         $decomposed = explode ('/', $mime);
         return in_array ($decomposed[0], $viewable);
     }


@@ -477,12 +501,12 @@ show_errors ()
     }
 }
 
     }
 }
 

-function check_errors ()
+function check_errors ($cfg)

 {
     if (file_exists (JIRAFEAU_ROOT . 'install.php')
 {
     if (file_exists (JIRAFEAU_ROOT . 'install.php')

-        && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))
+        && !($cfg['installation_done'] === true))

     {
     {

-        header('Location: install.php'); 
+        header('Location: install.php');

         exit;
     }
 
         exit;
     }
 


@@ -495,18 +519,9 @@ function check_errors ()
 
     if (!is_writable (VAR_LINKS))
         add_error (t('The link directory is not writable!'), VAR_LINKS);
 
     if (!is_writable (VAR_LINKS))
         add_error (t('The link directory is not writable!'), VAR_LINKS);

-    
+

     if (!is_writable (VAR_ASYNC))
         add_error (t('The async directory is not writable!'), VAR_ASYNC);
     if (!is_writable (VAR_ASYNC))
         add_error (t('The async directory is not writable!'), VAR_ASYNC);

-
-     if (!is_writable (VAR_BLOCK))
-        add_error (t('The block directory is not writable!'), VAR_BLOCK);
-
-   /* Check if the install.php script is still in the directory. */
-    if (file_exists (JIRAFEAU_ROOT . 'install.php'))
-        add_error (t('Installer script still present'),
-             t('Please make sure to delete the installer script ' .
-               '"install.php" before continuing.'));

 }
 
 /**
 }
 
 /**


@@ -521,7 +536,7 @@ jirafeau_get_link ($hash)
 
     if (!file_exists ($link))
         return $out;
 
     if (!file_exists ($link))
         return $out;

-    
+

     $c = file ($link);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);
     $c = file ($link);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);


@@ -533,7 +548,8 @@ jirafeau_get_link ($hash)
     $out['upload_date'] = trim ($c[7]);
     $out['ip'] = trim ($c[8]);
     $out['link_code'] = trim ($c[9]);
     $out['upload_date'] = trim ($c[7]);
     $out['ip'] = trim ($c[8]);
     $out['link_code'] = trim ($c[9]);

-    
+    $out['crypted'] = trim ($c[10]) == 'C';
+

     return $out;
 }
 
     return $out;
 }
 


@@ -588,7 +604,7 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
                     continue;
 
                 /* Filter. */
                     continue;
 
                 /* Filter. */

-                if (!empty ($name) && !preg_match ("/$name/i", $l['file_name']))
+                if (!empty ($name) && !preg_match ("/$name/i", htmlspecialchars($l['file_name'])))

                     continue;
                 if (!empty ($file_hash) && $file_hash != $l['md5'])
                     continue;
                     continue;
                 if (!empty ($file_hash) && $file_hash != $l['md5'])
                     continue;


@@ -597,21 +613,28 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .

-                '<form action = "admin.php" method = "post">' .
-                '<input type = "hidden" name = "action" value = "download"/>' .
-                '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
-                '<input type = "submit" value = "' . $l['file_name'] . '" />' .
-                '</form>';
+                '<strong><a id="upload_link" href="/f.php?h='. htmlspecialchars($node) .'" title="' .
+                    t('Download page') . '">' . htmlspecialchars($l['file_name']) . '</a></strong>';

                 echo '</td>';
                 echo '<td>' . $l['mime_type'] . '</td>';
                 echo '<td>' . jirafeau_human_size ($l['file_size']) . '</td>';
                 echo '<td>' . ($l['time'] == -1 ? '' : strftime ('%c', $l['time'])) .
                      '</td>';
                 echo '</td>';
                 echo '<td>' . $l['mime_type'] . '</td>';
                 echo '<td>' . jirafeau_human_size ($l['file_size']) . '</td>';
                 echo '<td>' . ($l['time'] == -1 ? '' : strftime ('%c', $l['time'])) .
                      '</td>';

-                echo '<td>' . $l['onetime'] . '</td>';
+                echo '<td>';
+                if ($l['onetime'] == 'O')
+                    echo 'Y';
+                else
+                    echo 'N';
+                echo '</td>';

                 echo '<td>' . strftime ('%c', $l['upload_date']) . '</td>';
                 echo '<td>' . $l['ip'] . '</td>';
                 echo '<td>' .
                 '<form action = "admin.php" method = "post">' .
                 echo '<td>' . strftime ('%c', $l['upload_date']) . '</td>';
                 echo '<td>' . $l['ip'] . '</td>';
                 echo '<td>' .
                 '<form action = "admin.php" method = "post">' .

+                '<input type = "hidden" name = "action" value = "download"/>' .
+                '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
+                '<input type = "submit" value = "' . t('Download') . '" />' .
+                '</form>' .
+                '<form action = "admin.php" method = "post">' .

                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<input type = "submit" value = "' . t('Del link') . '" />' .
                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<input type = "submit" value = "' . t('Del link') . '" />' .


@@ -648,7 +671,7 @@ jirafeau_admin_clean ()
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;

-            
+

             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */
             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */


@@ -694,7 +717,7 @@ jirafeau_admin_clean_async ()
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;
             if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
                 preg_match ('/\.tmp/i', "$node"))
                 continue;

-            
+

             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */
             if (is_dir ($d . $node))
             {
                 /* Push new found directory. */


@@ -729,7 +752,7 @@ jirafeau_get_async_ref ($ref)
 
     if (!file_exists ($refinfos))
         return $out;
 
     if (!file_exists ($refinfos))
         return $out;

-    
+

     $c = file ($refinfos);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);
     $c = file ($refinfos);
     $out['file_name'] = trim ($c[0]);
     $out['mime_type'] = trim ($c[1]);


@@ -744,7 +767,7 @@ jirafeau_get_async_ref ($ref)
 
 /**
  * Delete async transfert informations
 
 /**
  * Delete async transfert informations

-  */
+ */

 function
 jirafeau_async_delete ($ref)
 {
 function
 jirafeau_async_delete ($ref)
 {


@@ -758,7 +781,7 @@ jirafeau_async_delete ($ref)
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.
     while (file_exists ($parse)
            && ($scan = scandir ($parse))
            && count ($scan) == 2 // '.' and '..' folders => empty.

-           && basename ($parse) != basename (VAR_ASYNC)) 
+           && basename ($parse) != basename (VAR_ASYNC))

     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
     {
         rmdir ($parse);
         $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);


@@ -772,7 +795,7 @@ jirafeau_async_delete ($ref)
   * @param $key eventual password (or blank)
   * @param $time time limit
   * @param $ip ip address of the client
   * @param $key eventual password (or blank)
   * @param $time time limit
   * @param $ip ip address of the client

-  * @return  a string containing a temporary reference followed by a code or the string "Error"
+  * @return a string containing a temporary reference followed by a code or the string 'Error'

   */
 function
 jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
   */
 function
 jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)


@@ -791,10 +814,10 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
     @mkdir ($p, 0755, true);
     if (!file_exists ($p))
     {
     @mkdir ($p, 0755, true);
     if (!file_exists ($p))
     {

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

         return;
     }
         return;
     }

-    
+

     /* md5 password or empty */
     $password = '';
     if (!empty ($key))
     /* md5 password or empty */
     $password = '';
     if (!empty ($key))


@@ -818,26 +841,39 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
   * @param $ref asynchronous upload reference
   * @param $file piece of data
   * @param $code client code for this operation
   * @param $ref asynchronous upload reference
   * @param $file piece of data
   * @param $code client code for this operation

-  * @return  a string containing a next code to use or the string "Error"
+  * @param $max_file_size maximum allowed file size
+  * @return a string containing a next code to use or the string "Error"

   */
 function
   */
 function

-jirafeau_async_push ($ref, $data, $code)
+jirafeau_async_push ($ref, $data, $code, $max_file_size)

 {
     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);
 {
     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);

-    
+

     /* Check some errors. */
     if (count ($a) == 0
         || $a['next_code'] != "$code"
         || empty ($data['tmp_name'])
         || !is_uploaded_file ($data['tmp_name']))
     /* Check some errors. */
     if (count ($a) == 0
         || $a['next_code'] != "$code"
         || empty ($data['tmp_name'])
         || !is_uploaded_file ($data['tmp_name']))

-        return "Error";
-    
+        return 'Error';
+

     $p = s2p ($ref);
 
     $p = s2p ($ref);
 

+    /* File path. */
+    $r_path = $data['tmp_name'];
+    $w_path = VAR_ASYNC . $p . $ref . '_data';
+
+    /* Check that file size is not above upload limit. */
+    if ($max_file_size > 0 &&
+        filesize ($r_path) + filesize ($w_path) > $max_file_size * 1024 * 1024)
+    {
+        jirafeau_async_delete ($ref);
+        return 'Error';
+    }
+

     /* Concatenate data. */
     /* Concatenate data. */

-    $r = fopen ($data['tmp_name'], 'r');
-    $w = fopen (VAR_ASYNC . $p . $ref . '_data', 'a');
+    $r = fopen ($r_path, 'r');
+    $w = fopen ($w_path, 'a');

     while (!feof ($r))
     {
         if (fwrite ($w, fread ($r, 1024)) === false)
     while (!feof ($r))
     {
         if (fwrite ($w, fread ($r, 1024)) === false)


@@ -845,13 +881,13 @@ jirafeau_async_push ($ref, $data, $code)
             fclose ($r);
             fclose ($w);
             jirafeau_async_delete ($ref);
             fclose ($r);
             fclose ($w);
             jirafeau_async_delete ($ref);

-            return "Error";
+            return 'Error';

         }
     }
     fclose ($r);
     fclose ($w);
         }
     }
     fclose ($r);
     fclose ($w);

-    unlink ($data['tmp_name']);
-    
+    unlink ($r_path);
+

     /* Update async file. */
     $code = jirafeau_gen_random (4);
     $handle = fopen (VAR_ASYNC . $p . $ref, 'w');
     /* Update async file. */
     $code = jirafeau_gen_random (4);
     $handle = fopen (VAR_ASYNC . $p . $ref, 'w');


@@ -867,32 +903,44 @@ jirafeau_async_push ($ref, $data, $code)
   * Finalyze an asynchronous upload.
   * @param $ref asynchronous upload reference
   * @param $code client code for this operation
   * Finalyze an asynchronous upload.
   * @param $ref asynchronous upload reference
   * @param $code client code for this operation

-  * @return  a string containing the download reference followed by a delete code or the string "Error"
+  * @param $crypt boolean asking to crypt or not
+  * @param $link_name_length link name length
+  * @return a string containing the download reference followed by a delete code or the string 'Error'

   */
 function
   */
 function

-jirafeau_async_end ($ref, $code)
+jirafeau_async_end ($ref, $code, $crypt, $link_name_length)

 {
     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);
     if (count ($a) == 0
         || $a['next_code'] != "$code")
         return "Error";
 {
     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);
     if (count ($a) == 0
         || $a['next_code'] != "$code")
         return "Error";

-    
+

     /* Generate link infos. */
     $p = VAR_ASYNC . s2p ($ref) . $ref . "_data";
     if (!file_exists($p))
     /* Generate link infos. */
     $p = VAR_ASYNC . s2p ($ref) . $ref . "_data";
     if (!file_exists($p))

-        return "Error";
+        return 'Error';
+
+    $crypted = false;
+    $crypt_key = '';
+    if ($crypt == true && extension_loaded('mcrypt') == true)
+    {
+        $crypt_key = jirafeau_encrypt_file ($p, $p);
+        if (strlen($crypt_key) > 0)
+            $crypted = true;
+    }
+

     $md5 = md5_file ($p);
     $size = filesize($p);
     $np = s2p ($md5);
     $md5 = md5_file ($p);
     $size = filesize($p);
     $np = s2p ($md5);

-    $delete_link_code = jirafeau_gen_random (8);
-    
-    /* File already exist ? */ 
+    $delete_link_code = jirafeau_gen_random (5);
+
+    /* File already exist ? */

     if (!file_exists (VAR_FILES . $np))
         @mkdir (VAR_FILES . $np, 0755, true);
     if (!file_exists (VAR_FILES . $np . $md5))
         rename ($p, VAR_FILES . $np . $md5);
     if (!file_exists (VAR_FILES . $np))
         @mkdir (VAR_FILES . $np, 0755, true);
     if (!file_exists (VAR_FILES . $np . $md5))
         rename ($p, VAR_FILES . $np . $md5);

-    
+

     /* Increment or create count file. */
     $counter = 0;
     if (file_exists (VAR_FILES . $np . $md5 . '_count'))
     /* Increment or create count file. */
     $counter = 0;
     if (file_exists (VAR_FILES . $np . $md5 . '_count'))


@@ -904,328 +952,410 @@ jirafeau_async_end ($ref, $code)
     $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w');
     fwrite ($handle, $counter);
     fclose ($handle);
     $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w');
     fwrite ($handle, $counter);
     fclose ($handle);

-    
+

     /* Create link. */
     /* Create link. */

-    $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . ' .tmp';
+    $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . '.tmp';

     $handle = fopen ($link_tmp_name, 'w');
     fwrite ($handle,
             $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
             $a['key'] . NL . $a['time'] . NL . $md5 . NL . $a['onetime'] . NL .
     $handle = fopen ($link_tmp_name, 'w');
     fwrite ($handle,
             $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
             $a['key'] . NL . $a['time'] . NL . $md5 . NL . $a['onetime'] . NL .

-            date ('U') . NL . $a['ip'] . NL . $delete_link_code . NL);
+            date ('U') . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));

     fclose ($handle);
     fclose ($handle);

-    $md5_link = base_16_to_64 (md5_file ($link_tmp_name));
+    $md5_link = substr(base_16_to_64 (md5_file ($link_tmp_name)), 0, $link_name_length);

     $l = s2p ("$md5_link");
     if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
         !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
         echo "Error";
     $l = s2p ("$md5_link");
     if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
         !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
         echo "Error";

-    
+

     /* Clean async upload. */
     jirafeau_async_delete ($ref);
     /* Clean async upload. */
     jirafeau_async_delete ($ref);

-    return $md5_link . NL . $delete_link_code;
+    return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key);
+}
+
+function
+jirafeau_crypt_create_iv($base, $size)
+{
+    $iv = '';
+    while (strlen ($iv) < $size)
+        $iv = $iv . $base;
+    $iv = substr($iv, 0, $size);
+    return $iv;

 }
 
 /**
 }
 
 /**

-  * Delete a block.
-  * @param $id identifier of the block.
-  */
+ * Crypt file and returns decrypt key.
+ * @param $fp_src file path to the file to crypt.
+ * @param $fp_dst file path to the file to write crypted file (could be the same).
+ * @return decrypt key composed of the key and the iv separated by a point ('.')
+ */

 function
 function

-jirafeau_block_delete_ ($id)
+jirafeau_encrypt_file ($fp_src, $fp_dst)

 {
 {

-    $p = VAR_BLOCK . s2p ($id);
-    if (!file_exists ($p))
-        return;
-        
-    if (file_exists ($p . $id))
-       unlink ($p . $id);
-    if (file_exists ($p . $id . '_infos'))
-        unlink ($p . $id . '_infos');
-    $parse = $p;
-    $scan = array();
-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_BLOCK)) 
+    $fs = filesize ($fp_src);
+    if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true))
+        return '';
+
+    /* Prepare module. */
+    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
+    /* Generate key. */
+    $crypt_key = jirafeau_gen_random (10);
+    $md5_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+    /* Init module. */
+    mcrypt_generic_init($m, $md5_key, $iv);
+    /* Crypt file. */
+    $r = fopen ($fp_src, 'r');
+    $w = fopen ($fp_dst, 'c');
+    while (!feof ($r))

     {
     {

-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+        $enc = mcrypt_generic($m, fread ($r, 1024));
+        if (fwrite ($w, $enc) === false)
+            return '';

     }
     }

+    fclose ($r);
+    fclose ($w);
+    /* Cleanup. */
+    mcrypt_generic_deinit($m);
+    mcrypt_module_close($m);
+    return $crypt_key;

 }
 
 /**
 }
 
 /**

-  * Create a file filled with zeros.
-  * @param $size size of the file.
-  * @return  a string corresponding to an id or the string "Error"
-  */
+ * Decrypt file.
+ * @param $fp_src file path to the file to decrypt.
+ * @param $fp_dst file path to the file to write decrypted file (could be the same).
+ * @param $k string composed of the key and the iv separated by a point ('.')
+ * @return key used to decrypt. a string of length 0 is returned if failed.
+ */

 function
 function

-jirafeau_block_init ($size)
+jirafeau_decrypt_file ($fp_src, $fp_dst, $k)

 {
 {

-    if (!ctype_digit ($size) || $size <= 0)
-        return "Error";
-
-    /* Create folder. */
-    $id;
-    do
-    {
-        $id = jirafeau_gen_random (32);
-        $p = VAR_BLOCK . s2p ($id);
-    } while (file_exists ($p));
-    @mkdir ($p, 0755, true);
-    if (!file_exists ($p))
+    $fs = filesize ($fp_src);
+    if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false)
+        return false;
+
+    /* Init module */
+    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
+    /* Extract key and iv. */
+    $crypt_key = $k;
+    $md5_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+    /* Decrypt file. */
+    $r = fopen ($fp_src, 'r');
+    $w = fopen ($fp_dst, 'c');
+    while (!feof ($r))

     {
     {

-        echo "Error";
-        return;
+        $dec = mdecrypt_generic($m, fread ($r, 1024));
+        if (fwrite ($w, $dec) === false)
+            return false;

     }
     }

+    fclose ($r);
+    fclose ($w);
+    /* Cleanup. */
+    mcrypt_generic_deinit($m);
+    mcrypt_module_close($m);
+    return true;
+}

 
 

-    /* Create block. */
-    $p .= $id;
-    $h = fopen ($p, 'w');
-    $fill = str_repeat ("\0", 1024);
-    for ($cnt = 0; $cnt < $size; $cnt += 1024)
-    {
-       if ($size - $cnt < 1024)
-            $fill = str_repeat ("\0", $size - $cnt);
-        if (fwrite ($h, $fill) === false)
-        {
-            fclose ($h);
-            jirafeau_block_delete_ ($id);
-            return "Error";
-        }
-    }
-    fclose ($h);
+/**
+ * Check if Jirafeau is password protected for visitors.
+ * @return true if Jirafeau is password protected, false otherwise.
+ */
+function
+jirafeau_has_upload_password ($cfg)
+{
+    return count ($cfg['upload_password']) > 0;
+}

 
 

-    /* Generate a write/delete code. */
-    $code = jirafeau_gen_random (12);
+/**
+ * Challenge password for a visitor.
+ * @param $password password to be challenged
+ * @return true if password is valid, false otherwise.
+ */
+function
+jirafeau_challenge_upload_password ($cfg, $password)
+{
+    if (!jirafeau_has_upload_password($cfg))
+        return false;
+    forEach ($cfg['upload_password'] as $p)
+        if ($password == $p)
+            return true;
+    return false;
+}

 
 

-    /* Add block infos. */
-    if (file_put_contents ($p . '_infos', date ('U') . NL . $size . NL . $code) === FALSE)
+/**
+ * Test if visitor's IP is authorized to upload.
+ * @param $ip IP to be challenged
+ * @return true if IP is authorized, false otherwise.
+ */
+function
+jirafeau_challenge_upload_ip ($cfg, $ip)
+{
+    if (count ($cfg['upload_ip']) == 0)
+        return true;
+    forEach ($cfg['upload_ip'] as $i)

     {
     {

-        jirafeau_block_delete_ ($id);
-        return "Error";
+        if ($i == $ip)
+            return true;
+        // CIDR test for IPv4 only.
+        if (strpos ($i, '/') !== false)
+        {
+            list ($subnet, $mask) = explode('/', $i);
+            if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet))
+                return true;
+        }

     }
     }

+    return false;
+}

 
 

-    return $id . NL . $code;
+/** Tell if we have some HTTP headers generated by a proxy */
+function
+has_http_forwarded()
+{
+    return
+        !empty ($_SERVER['HTTP_X_FORWARDED_FOR']) ||
+        !empty ($_SERVER['http_X_forwarded_for']);

 }
 
 /**
 }
 
 /**

-  * Read some data in a block.
-  * @param $id identifier of the block
-  * @param $start where to read data (starting from zero).
-  * @param $length length to read.
-  * @return  echo data
-  */
+ * Generate IP list from HTTP headers generated by a proxy
+ * @return  array of IP strings
+ */

 function
 function

-jirafeau_block_read ($id, $start, $length)
+get_ip_list_http_forwarded()

 {
 {

-    if (!ctype_digit ($start) || $start < 0
-        || !ctype_digit ($length) || $length <= 0)
-    {
-        echo "Error";
-        return;
-    }
-
-    $p = VAR_BLOCK . s2p ($id) . $id;
-    if (!file_exists ($p))
+    $ip_list = array();
+    if (!empty ($_SERVER['HTTP_X_FORWARDED_FOR']))

     {
     {

-        echo "Error";
-        return;
+        $l = explode (',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+        if ($l === FALSE)
+            return array();
+        foreach ($l as $ip)
+            array_push ($ip_list, preg_replace ('/\s+/', '', $ip));

     }
     }

-
-    /* Check date. */
-    $f = file ($p . '_infos');
-    $date = trim ($f[0]);
-    $block_size = trim ($f[1]);
-    $stored_code = trim ($f[2]);
-    /* Update date. */
-    if (date ('U') - $date > JIRAFEAU_HOUR
-        && date ('U') - $date < JIRAFEAU_MONTH)
+    if (!empty ($_SERVER['http_X_forwarded_for']))

     {
     {

-        if (file_put_contents ($p . '_infos', date ('U') . NL . $block_size . NL . $stored_code) === FALSE)
+        $l = explode (',', $_SERVER['http_X_forwarded_for']);
+        foreach ($l as $ip)

         {
         {

-            jirafeau_block_delete_ ($id);
-            echo "Error";
-            return;
+            // Separate IP from port
+            $ipa = explode (':', $ip);
+            if ($ipa === FALSE)
+                continue;
+            $ip = $ipa[0];
+            array_push ($ip_list, preg_replace ('/\s+/', '', $ip));

         }
     }
         }
     }

-    /* Remove data. */
-    elseif (date ('U') - $date >= JIRAFEAU_MONTH)
-    {
-        echo date ('U'). " $date ";
-        jirafeau_block_delete_ ($id);
-        echo "Error";
-        return;
-    }
+    return $ip_list;
+}

 
 

-    if ($start + $length > $block_size)
-    {
-        echo "Error";
-        return;
-    }
+/**
+ * Get the ip address of the client from REMOTE_ADDR
+ * or from HTTP_X_FORWARDED_FOR if behind a proxy
+ * @returns the client ip address
+ */
+function
+get_ip_address($cfg)
+{
+    $remote = $_SERVER['REMOTE_ADDR'];
+    if (count ($cfg['proxy_ip']) == 0 || !has_http_forwarded ())
+        return $remote;

 
 

-    /* Read content. */
-    header ('Content-Length: ' . $length);
-    header ('Content-Disposition: attachment');
+    $ip_list = get_ip_list_http_forwarded ();
+    if (count ($ip_list) == 0)
+        return $remote;

 
 

-    $r = fopen ($p, 'r');
-    if (fseek ($r, $start) != 0)
-    {
-        echo "Error";
-        return;
-    }
-    $c = 1024;
-    for ($cnt = 0; $cnt < $length && !feof ($r); $cnt += 1024)
+    foreach ($cfg['proxy_ip'] as $proxy_ip)

     {
     {

-        if ($length - $cnt < 1024)
-            $c = $length - $cnt;
-        print fread ($r, $c);
-        ob_flush();
+        if ($remote != $proxy_ip)
+            continue;
+        // Take the last IP (the one which has been set by the defined proxy).
+        return end ($ip_list);

     }
     }

-    fclose ($r);
+    return $remote;

 }
 
 /**
 }
 
 /**

-  * Write some data in a block.
-  * @param $id identifier of the block
-  * @param $start where to writing data (starting from zero).
-  * @param $data data to write.
-  * @param $code code to allow writing.
-  * @return  string "Ok" or string "Error".
-  */
+ * Convert hexadecimal string to base64
+ */
+function hex_to_base64($hex)
+{
+    $b = '';
+    foreach (str_split ($hex, 2) as $pair)
+        $b .= chr (hexdec ($pair));
+    return base64_encode ($b);
+}
+
+/**
+ * Read alias informations
+ * @return array containing informations.
+ */

 function
 function

-jirafeau_block_write ($id, $start, $data, $code)
+jirafeau_get_alias ($hash)

 {
 {

-    if (!ctype_digit ($start) || $start < 0
-        || strlen ($code) == 0)
-        return "Error";
+    $out = array ();
+    $link = VAR_ALIAS . s2p ("$hash") . $hash;

 
 

-    $p = VAR_BLOCK . s2p ($id) . $id;
-    if (!file_exists ($p))
-        return "Error";
+    if (!file_exists ($link))
+        return $out;

 
 

-    /* Check date. */
-    $f = file ($p . '_infos');
-    $date = trim ($f[0]);
-    $block_size = trim ($f[1]);
-    $stored_code = trim ($f[2]);
-    /* Update date. */
-    if (date ('U') - $date > JIRAFEAU_HOUR
-        && date ('U') - $date < JIRAFEAU_MONTH)
-    {
-        if (file_put_contents ($p . '_infos', date ('U') . NL . $block_size . NL . $stored_code) === FALSE)
-        {
-            jirafeau_block_delete_ ($id);
-            return "Error";
-        }
-    }
-    /* Remove data. */
-    elseif (date ('U') - $date >= JIRAFEAU_MONTH)
-    {
-        jirafeau_block_delete_ ($id);
-        return "Error";
-    }
+    $c = file ($link);
+    $out['md5_password'] = trim ($c[0]);
+    $out['ip'] = trim ($c[1]);
+    $out['update_date'] = trim ($c[2]);
+    $out['destination'] = trim ($c[3], NL);

 
 

-    /* Check code. */
-    if ($stored_code != $code)
-    {
-        echo "Error";
-        return;
-    }
+    return $out;
+}

 
 

-    /* Check data. */
-    $size = $data['size'];
-    if ($size <= 0)
-        return "Error";
-    if ($start + $size > $block_size)
-        return "Error";
-    
-    /* Open data. */
-    $r = fopen ($data['tmp_name'], 'r');
+/** Create an alias to a jirafeau's link.
+ * @param $alias alias name
+ * @param $destination reference of the destination
+ * @param $password password to protect alias
+ * @param $ip client's IP
+ * @return  a string containing the edit code of the alias or the string "Error"
+ */
+function
+jirafeau_alias_create ($alias, $destination, $password, $ip)
+{
+    /* Check that alias and password are long enough. */
+    if (strlen ($alias) < 8 ||
+        strlen ($alias) > 32 ||
+        strlen ($password) < 8 ||
+        strlen ($password) > 32)
+        return 'Error';
+
+    /* Check that destination exists. */
+    $l = jirafeau_get_link ($destination);
+    if (!count ($l))
+        return 'Error';

 
 

-    /* Open Block. */
-    $w = fopen ($p, 'r+');
-    if (fseek ($w, $start) != 0)
-        return "Error";
+    /* Check that alias does not already exists. */
+    $alias = md5 ($alias);
+    $p = VAR_ALIAS . s2p ($alias);
+    if (file_exists ($p))
+        return 'Error';

 
 

-    /* Write content. */
-    $c = 1024;
-    for ($cnt = 0; $cnt <= $size && !feof ($w); $cnt += 1024)
-    {
-        if ($size - $cnt < 1024)
-            $c = $size - $cnt;
-        $d = fread ($r, $c);
-        fwrite ($w, $d);
-    }
-    fclose ($r);
-    fclose ($w);
-    unlink ($data['tmp_name']);
-    return "Ok";
+    /* Create alias folder. */
+    @mkdir ($p, 0755, true);
+    if (!file_exists ($p))
+        return 'Error';
+
+    /* Generate password. */
+    $md5_password = md5 ($password);
+
+    /* Store informations. */
+    $p .= $alias;
+    $handle = fopen ($p, 'w');
+    fwrite ($handle,
+            $md5_password . NL .
+            $ip . NL .
+            date ('U') . NL .
+            $destination . NL);
+    fclose ($handle);
+
+    return 'Ok';

 }
 
 }
 

-/**
-  * Delete a block.
-  * @param $id identifier of the block.
-  * @param $code code to allow writing.
-  * @return  string "Ok" or string "Error".
-  */
+/** Update an alias.
+ * @param $alias alias to update
+ * @param $destination reference of the new destination
+ * @param $password password to protect alias
+ * @param $new_password optional new password to protect alias
+ * @param $ip client's IP
+ * @return "Ok" or "Error" string
+ */

 function
 function

-jirafeau_block_delete ($id, $code)
+jirafeau_alias_update ($alias, $destination, $password,
+                       $new_password, $ip)

 {
 {

-    $p = VAR_BLOCK . s2p ($id) . $id;
-
-    if (!file_exists ($p))
-        return "Error";
+    $alias = md5 ($alias);
+    /* Check that alias exits. */
+    $a = jirafeau_get_alias ($alias);
+    if (!count ($a))
+        return 'Error';
+
+    /* Check that destination exists. */
+    $l = jirafeau_get_link ($a["destination"]);
+    if (!count ($l))
+        return 'Error';

 
 

-    $f = file ($p . '_infos');
-    $date = trim ($f[0]);
-    $block_size = trim ($f[1]);
-    $stored_code = trim ($f[2]);
+    /* Check password. */
+    if ($a["md5_password"] != md5 ($password))
+        return 'Error';

 
 

-    if ($code != $stored_code)
-        return "Error";
+    $p = $a['md5_password'];
+    if (strlen ($new_password) >= 8 &&
+        strlen ($new_password) <= 32)
+        $p = md5 ($new_password);
+    else if (strlen ($new_password) > 0)
+        return 'Error';

 
 

-    jirafeau_block_delete_ ($id);
-    return "Ok";
+    /* Rewrite informations. */
+    $p = VAR_ALIAS . s2p ($alias) . $alias;
+    $handle = fopen ($p, 'w');
+    fwrite ($handle,
+            $p . NL .
+            $ip . NL .
+            date ('U') . NL .
+            $destination . NL);
+    fclose ($handle);
+    return 'Ok';

 }
 
 }
 

-/**
- * Clean old unused blocks.
- * @return number of cleaned blocks.
+/** Get an alias.
+ * @param $alias alias to get
+ * @return alias destination or "Error" string

  */
 function
  */
 function

-jirafeau_admin_clean_block ()
+jirafeau_alias_get ($alias)

 {
 {

-    $count = 0;
-    /* Get all blocks. */
-    $stack = array (VAR_BLOCK);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
+    $alias = md5 ($alias);
+    /* Check that alias exits. */
+    $a = jirafeau_get_alias ($alias);
+    if (!count ($a))
+        return 'Error';

 
 

-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0)
-                continue;
+    return $a['destination'];
+}

 
 

-            if (is_dir ($d . $node))
-            {
-                /* Push new found directory. */
-                $stack[] = $d . $node . '/';
-            }
-            elseif (is_file ($d . $node) && preg_match ('/\_infos/i', "$node"))
-            {
-                /* Read block informations. */
-                $f = file ($d . $node);
-                $date = trim ($f[0]);
-                $block_size = trim ($f[1]);
-                if (date ('U') - $date >= JIRAFEAU_MONTH)
-                {
-                    jirafeau_block_delete_ (substr($node, 0, -6));
-                    $count++;
-                }
-            }
-        }
+function
+jirafeau_clean_rm_alias ($alias)
+{
+    $p = s2p ("$alias");
+    if (file_exists (VAR_ALIAS . $p . $alias))
+        unlink (VAR_ALIAS . $p . $alias);
+    $parse = VAR_ALIAS . $p;
+    $scan = array();
+    while (file_exists ($parse)
+           && ($scan = scandir ($parse))
+           && count ($scan) == 2 // '.' and '..' folders => empty.
+           && basename ($parse) != basename (VAR_ALIAS))
+    {
+        rmdir ($parse);
+        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);

     }
     }

-    return $count;

 }
 
 }
 

+/** Delete an alias.
+ * @param $alias alias to delete
+ * @param $password password to protect alias
+ * @return "Ok" or "Error" string
+ */
+function
+jirafeau_alias_delete ($alias, $password)
+{
+    $alias = md5 ($alias);
+    /* Check that alias exits. */
+    $a = jirafeau_get_alias ($alias);
+    if (!count ($a))
+        return "Error";
+
+    /* Check password. */
+    if ($a["md5_password"] != md5 ($password))
+        return 'Error';
+
+    jirafeau_clean_rm_alias ($alias);
+    return 'Ok';
+}

 
 

-?>