[TASK] clean install.php functions

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 1e5b08355b53da1ad4be8f2cb43ec29dedbca602..b3dc9045f930dc9462bf5c6cbcdcc7a7daeee72f 100644 (file)
--- 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 <jerome@jutteau.fr>
+ *  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,19 +16,26 @@
  *  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)

 {
 {

+    $block_size = 8;

     $p = '';
     $p = '';

-    for ($i = 0; $i < strlen ($s); $i++)
-        $p .= $s{$i} . '/';
+    for ($i = 0; $i < strlen($s); $i++) {
+        $p .= $s{$i};
+        if (($i + 1) % $block_size == 0) {
+            $p .= '/';
+        }
+    }
+    if (strlen($s) % $block_size != 0) {
+        $p .= '/';
+    }

     return $p;
 }
 
     return $p;
 }
 


@@ -35,40 +43,42 @@ s2p ($s)
  * Convert base 16 to base 64
  * @returns A string based on 64 characters (0-9, a-z, A-Z, "-" and "_")
  */
  * Convert base 16 to base 64
  * @returns A string based on 64 characters (0-9, a-z, A-Z, "-" and "_")
  */

-function
-base_16_to_64 ($num)
+function base_16_to_64($num)

 {
     $m = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_';
 {
     $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.
     $b = '';
     $i = 0;
     # Convert long hex string to bin.

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

     # Convert long bin to base 64.
     $size *= 4;
     # Convert long bin to base 64.
     $size *= 4;

-    for ($i = $size - 6; $i >= 0; $i -= 6)
-        $o = $m{bindec (substr ($b, $i, 6))} . $o;
+    for ($i = $size - 6; $i >= 0; $i -= 6) {
+        $o = $m{bindec(substr($b, $i, 6))} . $o;
+    }

     # Some few bits remaining ?
     # Some few bits remaining ?

-    if ($i < 0 && $i > -6)
-        $o = $m{bindec (substr ($b, 0, $i + 6))} . $o;
+    if ($i < 0 && $i > -6) {
+        $o = $m{bindec(substr($b, 0, $i + 6))} . $o;
+    }

     return $o;
 }
 
     return $o;
 }
 


@@ -77,77 +87,96 @@ base_16_to_64 ($num)
   * @param $l code length
   * @return  random code.
   */
   * @param $l code length
   * @return  random code.
   */

-function
-jirafeau_gen_random ($l)
+function jirafeau_gen_random($l)

 {
 {

-    if ($l <= 0)
+    if ($l <= 0) {

         return 42;
         return 42;

+    }

 
     $code="";
 
     $code="";

-    for ($i = 0; $i < $l; $i++)
-        $code .= dechex (rand (0, 15));
+    for ($i = 0; $i < $l; $i++) {
+        $code .= dechex(rand(0, 15));
+    }

 
     return $code;
 }
 
 
     return $code;
 }
 

-function is_ssl() {
-    if ( isset($_SERVER['HTTPS']) ) {
-        if ( 'on' == strtolower($_SERVER['HTTPS']) )
-            return true;
-        if ( '1' == $_SERVER['HTTPS'] )
+function is_ssl()
+{
+    if (isset($_SERVER['HTTPS'])) {
+        if ('on' == strtolower($_SERVER['HTTPS']) ||
+             '1' == $_SERVER['HTTPS']) {

             return true;
             return true;

-    } elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+        }
+    } elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {

         return true;
         return true;

+    } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+        if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
+            return true;
+        }

     }
     return false;
 }
 
     }
     return false;
 }
 

-function
-jirafeau_human_size ($octets)
+function jirafeau_human_size($octets)

 {
 {

-    $u = array ('B', 'KB', 'MB', 'GB', 'TB');
-    $o = max ($octets, 0);
-    $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)
+    $u = array('B', 'KB', 'MB', 'GB', 'TB');
+    $o = max($octets, 0);
+    $p = min(floor(($o ? log($o) : 0) / log(1024)), count($u) - 1);
+    $o /= pow(1024, $p);
+    return round($o, 1) . $u[$p];
+}
+
+// Convert UTC timestamp to a datetime field
+function jirafeau_get_datetimefield($timestamp)

 {
 {

-    $p = s2p ("$link");
-    if (file_exists (VAR_LINKS . $p . $link))
-        unlink (VAR_LINKS . $p . $link);
+    $content = '<span class="datetime" data-datetime="' . strftime('%Y-%m-%d %H:%M', $timestamp) . '">'
+        . strftime('%Y-%m-%d %H:%M', $timestamp) . ' (GMT)</span>';
+    return $content;
+}
+
+function jirafeau_fatal_error($errorText, $cfg = array())
+{
+    echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
+    exit;
+}
+
+function jirafeau_clean_rm_link($link)
+{
+    $p = s2p("$link");
+    if (file_exists(VAR_LINKS . $p . $link)) {
+        unlink(VAR_LINKS . $p . $link);
+    }

     $parse = VAR_LINKS . $p;
     $scan = array();
     $parse = VAR_LINKS . $p;
     $scan = array();

-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_LINKS)) 
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    while (file_exists($parse)
+           && ($scan = scandir($parse))
+           && count($scan) == 2 // '.' and '..' folders => empty.
+           && basename($parse) != basename(VAR_LINKS)) {
+        rmdir($parse);
+        $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);

     }
 }
 
     }
 }
 

-function
-jirafeau_clean_rm_file ($md5)
+function jirafeau_clean_rm_file($hash)

 {
 {

-    $p = s2p ("$md5");
-    $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');
+    $p = s2p("$hash");
+    $f = VAR_FILES . $p . $hash;
+    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();
     $parse = VAR_FILES . $p;
     $scan = array();

-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_FILES)) 
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    while (file_exists($parse)
+           && ($scan = scandir($parse))
+           && count($scan) == 2 // '.' and '..' folders => empty.
+           && basename($parse) != basename(VAR_FILES)) {
+        rmdir($parse);
+        $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);

     }
 }
 
     }
 }
 


@@ -156,24 +185,25 @@ 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);
-    switch (strtoupper ($modifier))
-    {
+    $modifier = substr($value, -1);
+    $bytes = substr($value, 0, -1);
+    switch (strtoupper($modifier)) {

     case 'P':
         $bytes *= 1024;
     case 'P':
         $bytes *= 1024;

+        // no break

     case 'T':
         $bytes *= 1024;
     case 'T':
         $bytes *= 1024;

+        // no break

     case 'G':
         $bytes *= 1024;
     case 'G':
         $bytes *= 1024;

+        // no break

     case 'M':
         $bytes *= 1024;
     case 'M':
         $bytes *= 1024;

+        // no break

     case 'K':
         $bytes *= 1024;
     case 'K':
         $bytes *= 1024;

-    default:
-        break;

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


@@ -182,23 +212,21 @@ function jirafeau_ini_to_bytes ($value)
  * gets the maximum upload size according to php.ini
  * @returns the maximum upload size in bytes
  */
  * gets the maximum upload size according to php.ini
  * @returns the maximum upload size in bytes
  */

-function
-jirafeau_get_max_upload_size_bytes ()
+function jirafeau_get_max_upload_size_bytes()

 {
 {

-    return min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
-                jirafeau_ini_to_bytes (ini_get ('upload_max_filesize')));
+    return min(
+        jirafeau_ini_to_bytes(ini_get('post_max_size')),
+        jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))
+    );

 }
 
 /**
  * gets the maximum upload size according to php.ini
  * @returns the maximum upload size string
  */
 }
 
 /**
  * gets the maximum upload size according to php.ini
  * @returns the maximum upload size string
  */

-function
-jirafeau_get_max_upload_size ()
+function jirafeau_get_max_upload_size()

 {
 {

-    return jirafeau_human_size(
-            min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
-                 jirafeau_ini_to_bytes (ini_get ('upload_max_filesize'))));
+    return jirafeau_human_size(jirafeau_get_max_upload_size_bytes());

 }
 
 /**
 }
 
 /**


@@ -206,31 +234,22 @@ jirafeau_get_max_upload_size ()
  * @param $code the error code
  * @returns a string explaining the error
  */
  * @param $code the error code
  * @returns a string explaining the error
  */

-function
-jirafeau_upload_errstr ($code)
+function jirafeau_upload_errstr($code)

 {
 {

-    switch ($code)
-    {
+    switch ($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. ');
 }


@@ -239,79 +258,125 @@ jirafeau_upload_errstr ($code)
  * @param $link the link's name (hash)
  */
 
  * @param $link the link's name (hash)
  */
 

-function
-jirafeau_delete_link ($link)
+function jirafeau_delete_link($link)

 {
 {

-    $l = jirafeau_get_link ($link);
-    if (!count ($l))
+    $l = jirafeau_get_link($link);
+    if (!count($l)) {

         return;
         return;

+    }

 
 

-    jirafeau_clean_rm_link ($link);
+    jirafeau_clean_rm_link($link);

 
 

-    $md5 = $l['md5'];
-    $p = s2p ("$md5");
+    $hash = $l['hash'];
+    $p = s2p("$hash");

 
     $counter = 1;
 
     $counter = 1;

-    if (file_exists (VAR_FILES . $p . $md5. '_count'))
-    {
-        $content = file (VAR_FILES . $p . $md5. '_count');
-        $counter = trim ($content[0]);
+    if (file_exists(VAR_FILES . $p . $hash. '_count')) {
+        $content = file(VAR_FILES . $p . $hash. '_count');
+        $counter = trim($content[0]);

     }
     $counter--;
 
     }
     $counter--;
 

-    if ($counter >= 1)
-    {
-        $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w');
-        fwrite ($handle, $counter);
-        fclose ($handle);
+    if ($counter >= 1) {
+        $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w');
+        fwrite($handle, $counter);
+        fclose($handle);

     }
 
     }
 

-    if ($counter == 0)
-        jirafeau_clean_rm_file ($md5);
+    if ($counter == 0) {
+        jirafeau_clean_rm_file($hash);
+    }

 }
 
 /**
  * Delete a file and it's links.
  */
 }
 
 /**
  * Delete a file and it's links.
  */

-function
-jirafeau_delete_file ($md5)
+function jirafeau_delete_file($hash)

 {
     $count = 0;
     /* Get all links files. */
 {
     $count = 0;
     /* Get all links files. */

-    $stack = array (VAR_LINKS);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_LINKS);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {

                 continue;
                 continue;

-            
-            if (is_dir ($d . $node))
-            {
+            }
+
+            if (is_dir($d . $node)) {

                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';

-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {

                 /* Read link informations. */
                 /* Read link informations. */

-                $l = jirafeau_get_link (basename ($node));
-                if (!count ($l))
+                $l = jirafeau_get_link(basename($node));
+                if (!count($l)) {

                     continue;
                     continue;

-                if ($l['md5'] == $md5)
-                {
+                }
+                if ($l['hash'] == $hash) {

                     $count++;
                     $count++;

-                    jirafeau_delete_link ($node);
-                }   
+                    jirafeau_delete_link($node);
+                }

             }
         }
     }
             }
         }
     }

-    jirafeau_clean_rm_file ($md5);
+    jirafeau_clean_rm_file($hash);

     return $count;
 }
 
     return $count;
 }
 

+
+/** hash file's content
+ * @param $method hash method, see 'file_hash' option. Valid methods are 'md5', 'md5_outside' or 'random'
+ * @param $file_path file to hash
+ * @returns hash string
+ */
+function jirafeau_hash_file($method, $file_path)
+{
+    switch ($method) {
+        case 'md5_outside':
+            return jirafeau_md5_outside($file_path);
+        case 'md5':
+            return md5_file($file_path);
+        case 'random':
+            return jirafeau_gen_random(32);
+    }
+    return md5_file($file_path);
+}
+
+/** hash part of file: start, end and size.
+ * This is a partial file hash, faster but weaker.
+ * @param $file_path file to hash
+ * @returns hash string
+ */
+function jirafeau_md5_outside($file_path)
+{
+    $out = false;
+    $handle = fopen($file_path, "r");
+    if ($handle === false) {
+        return false;
+    }
+    $size = filesize($file_path);
+    if ($size === false) {
+        goto err;
+    }
+    $first = fread($handle, 64);
+    if ($first === false) {
+        goto err;
+    }
+    if (fseek($handle, $size < 64 ? 0 : $size - 64) == -1) {
+        goto err;
+    }
+    $last = fread($handle, 64);
+    if ($last === false) {
+        goto err;
+    }
+    $out = md5($first . $last . $size);
+    err:
+    fclose($handle);
+    return $out;
+}
+

 /**
  * handles an uploaded file
  * @param $file the file struct given by $_FILE[]
 /**
  * handles an uploaded file
  * @param $file the file struct given by $_FILE[]


@@ -326,149 +391,142 @@ jirafeau_delete_file ($md5)
  *   'link' => the link name of the uploaded file
  *   'delete_link' => the link code to delete file
  */
  *   '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, $crypt, $link_name_length)
+function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method)

 {
 {

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

         return (array(
                  'error' =>
         return (array(
                  'error' =>

-                   array ('has_error' => true,
-                          'why' => jirafeau_upload_errstr ($file['error'])),
+                   array('has_error' => true,
+                          'why' => jirafeau_upload_errstr($file['error'])),

                  'link' => '',
                  'delete_link' => ''));
     }
 
     /* array representing no error */
                  'link' => '',
                  'delete_link' => ''));
     }
 
     /* array representing no error */

-    $noerr = array ('has_error' => false, 'why' => '');
+    $noerr = array('has_error' => false, 'why' => '');

 
     /* Crypt file if option is enabled. */
     $crypted = false;
     $crypt_key = '';
 
     /* Crypt file if option is enabled. */
     $crypted = false;
     $crypt_key = '';

-    if ($crypt == true && extension_loaded('mcrypt'))
-    {
-        $crypt_key = jirafeau_encrypt_file ($file['tmp_name'], $file['tmp_name']);
-        if (strlen($crypt_key) > 0)
+    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;
             $crypted = true;

+        }

     }
 
     /* file informations */
     }
 
     /* file informations */

-    $md5 = md5_file ($file['tmp_name']);
-    $name = str_replace (NL, '', trim ($file['name']));
+    $hash = jirafeau_hash_file($file_hash_method, $file['tmp_name']);
+    $name = str_replace(NL, '', trim($file['name']));

     $mime_type = $file['type'];
     $size = $file['size'];
 
     /* does file already exist ? */
     $rc = false;
     $mime_type = $file['type'];
     $size = $file['size'];
 
     /* does file already exist ? */
     $rc = false;

-    $p = s2p ("$md5");
-    if (file_exists (VAR_FILES . $p .  $md5))
-    {
-        $rc = unlink ($file['tmp_name']);
-    }
-    elseif ((file_exists (VAR_FILES . $p) || @mkdir (VAR_FILES . $p, 0755, true))
-            && move_uploaded_file ($file['tmp_name'], VAR_FILES . $p . $md5))
-    {
+    $p = s2p("$hash");
+    if (file_exists(VAR_FILES . $p .  $hash)) {
+        $rc = unlink($file['tmp_name']);
+    } elseif ((file_exists(VAR_FILES . $p) || @mkdir(VAR_FILES . $p, 0755, true))
+            && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $hash)) {

         $rc = true;
     }
         $rc = true;
     }

-    if (!$rc)
-    {
+    if (!$rc) {

         return (array(
                  'error' =>
         return (array(
                  'error' =>

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

                  'link' =>'',
                  'delete_link' => ''));
     }
 
     /* Increment or create count file. */
     $counter = 0;
                  'link' =>'',
                  'delete_link' => ''));
     }
 
     /* Increment or create count file. */
     $counter = 0;

-    if (file_exists (VAR_FILES . $p . $md5 . '_count'))
-    {
-        $content = file (VAR_FILES . $p . $md5. '_count');
-        $counter = trim ($content[0]);
+    if (file_exists(VAR_FILES . $p . $hash . '_count')) {
+        $content = file(VAR_FILES . $p . $hash. '_count');
+        $counter = trim($content[0]);

     }
     $counter++;
     }
     $counter++;

-    $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w');
-    fwrite ($handle, $counter);
-    fclose ($handle);
+    $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w');
+    fwrite($handle, $counter);
+    fclose($handle);

 
     /* Create delete code. */
 
     /* Create delete code. */

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

 
 

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

     $password = '';
     $password = '';

-    if (!empty ($key))
-        $password = md5 ($key);
+    if (!empty($key)) {
+        $password = md5($key);
+    }

 
     /* create link file */
 
     /* create link file */

-    $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') .
-            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O'));
-    fclose ($handle);
-    $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);
-        
-        $counter--;
-        if ($counter >= 1)
-        {
-            $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w');
-            fwrite ($handle, $counter);
-            fclose ($handle);
+    $link_tmp_name =  VAR_LINKS . $hash . rand(0, 10000) . '.tmp';
+    $handle = fopen($link_tmp_name, 'w');
+    fwrite(
+        $handle,
+        $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
+            NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .
+            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')
+    );
+    fclose($handle);
+    $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
+    $l = s2p("$hash_link");
+    if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
+        !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
+        if (file_exists($link_tmp_name)) {
+            unlink($link_tmp_name);

         }
         }

-        else
-        {
-            jirafeau_clean_rm_file ($md5_link);
+
+        $counter--;
+        if ($counter >= 1) {
+            $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w');
+            fwrite($handle, $counter);
+            fclose($handle);
+        } else {
+            jirafeau_clean_rm_file($hash_link);

         }
         }

-        return (array(
+        return array(

                  'error' =>
                  'error' =>

-                   array ('has_error' => true,
+                   array('has_error' => true,

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

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

     }
     }

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

                   'delete_link' => $delete_link_code,
                   'delete_link' => $delete_link_code,

-                  'crypt_key' => $crypt_key));
+                  '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
  */

-function
-jirafeau_is_viewable ($mime)
+function jirafeau_is_viewable($mime)

 {
 {

-    if (!empty ($mime))
-    {
+    if (!empty($mime)) {

         /* Actually, verify if mime-type is an image or a text. */
         /* Actually, verify if mime-type is an image or a text. */

-        $viewable = array ('image', 'text');
-        $decomposed = explode ('/', $mime);
-        return in_array ($decomposed[0], $viewable);
+        $viewable = array('image', 'text', 'video', 'audio');
+        $decomposed = explode('/', $mime);
+        return in_array($decomposed[0], $viewable);

     }
     return false;
 }
 
 // Error handling functions.
 //! Global array that contains all registered errors.
     }
     return false;
 }
 
 // Error handling functions.
 //! Global array that contains all registered errors.

-$error_list = array ();
+$error_list = array();

 
 /**
  * Adds an error to the list of errors.
  * @param $title the error's title
  * @param $description is a human-friendly description of the problem.
  */
 
 /**
  * Adds an error to the list of errors.
  * @param $title the error's title
  * @param $description is a human-friendly description of the problem.
  */

-function
-add_error ($title, $description)
+function add_error($title, $description)

 {
     global $error_list;
     $error_list[] = '<p>' . $title. '<br />' . $description. '</p>';
 {
     global $error_list;
     $error_list[] = '<p>' . $title. '<br />' . $description. '</p>';


@@ -478,172 +536,169 @@ add_error ($title, $description)
  * Informs whether any error has been registered yet.
  * @return true if there are errors.
  */
  * Informs whether any error has been registered yet.
  * @return true if there are errors.
  */

-function
-has_error ()
+function has_error()

 {
     global $error_list;
 {
     global $error_list;

-    return !empty ($error_list);
+    return !empty($error_list);

 }
 
 /**
  * Displays all the errors.
  */
 }
 
 /**
  * Displays all the errors.
  */

-function
-show_errors ()
+function show_errors()

 {
 {

-    if (has_error ())
-    {
+    if (has_error()) {

         global $error_list;
         echo '<div class="error">';
         global $error_list;
         echo '<div class="error">';

-        foreach ($error_list as $error)
-        {
+        foreach ($error_list as $error) {

             echo $error;
         }
         echo '</div>';
     }
 }
 
             echo $error;
         }
         echo '</div>';
     }
 }
 

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

 {
 {

-    if (file_exists (JIRAFEAU_ROOT . 'install.php')
-        && !($cfg['installation_done'] === true))
-    {
-        header('Location: install.php'); 
+    if (file_exists(JIRAFEAU_ROOT . 'install.php')
+        && !($cfg['installation_done'] === true)) {
+        header('Location: install.php');

         exit;
     }
 
         exit;
     }
 

-    /* check if the destination dirs are writable */
-    $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
-

     /* Checking for errors. */
     /* Checking for errors. */

-    if (!is_writable (VAR_FILES))
-        add_error (t('The file directory is not writable!'), VAR_FILES);
+    if (!is_writable(VAR_FILES)) {
+        add_error(t('FILE_DIR_W'), VAR_FILES);
+    }

 
 

-    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_LINKS)) {
+        add_error(t('LINK_DIR_W'), VAR_LINKS);
+    }

 
 

-     if (!is_writable (VAR_BLOCK))
-        add_error (t('The block directory is not writable!'), VAR_BLOCK);
+    if (!is_writable(VAR_ASYNC)) {
+        add_error(t('ASYNC_DIR_W'), VAR_ASYNC);
+    }
+
+    if ($cfg['enable_crypt'] && $cfg['litespeed_workaround']) {
+        add_error(t('INCOMPATIBLE_OPTIONS_W'), 'enable_crypt=true<br>litespeed_workaround=true');
+    }
+
+    if ($cfg['one_time_download'] && $cfg['litespeed_workaround']) {
+        add_error(t('INCOMPATIBLE_OPTIONS_W'), 'one_time_download=true<br>litespeed_workaround=true');
+    }

 }
 
 /**
  * Read link informations
  * @return array containing informations.
  */
 }
 
 /**
  * Read link informations
  * @return array containing informations.
  */

-function
-jirafeau_get_link ($hash)
+function jirafeau_get_link($hash)

 {
 {

-    $out = array ();
-    $link = VAR_LINKS . s2p ("$hash") . $hash;
+    $out = array();
+    $link = VAR_LINKS . s2p("$hash") . $hash;

 
 

-    if (!file_exists ($link))
+    if (!file_exists($link)) {

         return $out;
         return $out;

-    
-    $c = file ($link);
-    $out['file_name'] = trim ($c[0]);
-    $out['mime_type'] = trim ($c[1]);
-    $out['file_size'] = trim ($c[2]);
-    $out['key'] = trim ($c[3], NL);
-    $out['time'] = trim ($c[4]);
-    $out['md5'] = trim ($c[5]);
-    $out['onetime'] = trim ($c[6]);
-    $out['upload_date'] = trim ($c[7]);
-    $out['ip'] = trim ($c[8]);
-    $out['link_code'] = trim ($c[9]);
-    if (trim ($c[10]) == 'C')
-           $out['crypted'] = true;
-    else
-           $out['crypted'] = false;
-    
+    }
+
+    $c = file($link);
+    $out['file_name'] = trim($c[0]);
+    $out['mime_type'] = trim($c[1]);
+    $out['file_size'] = trim($c[2]);
+    $out['key'] = trim($c[3], NL);
+    $out['time'] = trim($c[4]);
+    $out['hash'] = trim($c[5]);
+    $out['onetime'] = trim($c[6]);
+    $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;
 }
 
 /**
  * List files in admin interface.
  */
     return $out;
 }
 
 /**
  * List files in admin interface.
  */

-function
-jirafeau_admin_list ($name, $file_hash, $link_hash)
+function jirafeau_admin_list($name, $file_hash, $link_hash)

 {
     echo '<fieldset><legend>';
 {
     echo '<fieldset><legend>';

-    if (!empty ($name))
-        echo t('Filename') . ": $name ";
-    if (!empty ($file_hash))
-        echo t('file') . ": $file_hash ";
-    if (!empty ($link_hash))
-        echo t('link') . ": $link_hash ";
-    if (empty ($name) && empty ($file_hash) && empty ($link_hash))
-        echo t('List all files');
+    if (!empty($name)) {
+        echo t('FILENAME') . ": " . jirafeau_escape($name);
+    }
+    if (!empty($file_hash)) {
+        echo t('FILE') . ": " . jirafeau_escape($file_hash);
+    }
+    if (!empty($link_hash)) {
+        echo t('LINK') . ": " . jirafeau_escape($link_hash);
+    }
+    if (empty($name) && empty($file_hash) && empty($link_hash)) {
+        echo t('LS_FILES');
+    }

     echo '</legend>';
     echo '<table>';
     echo '<tr>';
     echo '</legend>';
     echo '<table>';
     echo '<tr>';

-    echo '<td>' . t('Filename') . '</td>';
-    echo '<td>' . t('Type') . '</td>';
-    echo '<td>' . t('Size') . '</td>';
-    echo '<td>' . t('Expire') . '</td>';
-    echo '<td>' . t('Onetime') . '</td>';
-    echo '<td>' . t('Upload date') . '</td>';
-    echo '<td>' . t('Origin') . '</td>';
-    echo '<td>' . t('Action') . '</td>';
+    echo '<th></th>';
+    echo '<th>' . t('ACTION') . '</th>';

     echo '</tr>';
 
     /* Get all links files. */
     echo '</tr>';
 
     /* Get all links files. */

-    $stack = array (VAR_LINKS);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_LINKS);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {

                 continue;
                 continue;

-            if (is_dir ($d . $node))
-            {
+            }
+            if (is_dir($d . $node)) {

                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';

-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {

                 /* Read link informations. */
                 /* Read link informations. */

-                $l = jirafeau_get_link ($node);
-                if (!count ($l))
+                $l = jirafeau_get_link($node);
+                if (!count($l)) {

                     continue;
                     continue;

+                }

 
                 /* Filter. */
 
                 /* Filter. */

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

                     continue;
                     continue;

-                if (!empty ($file_hash) && $file_hash != $l['md5'])
+                }
+                if (!empty($file_hash) && $file_hash != $l['hash']) {

                     continue;
                     continue;

-                if (!empty ($link_hash) && $link_hash != $node)
+                }
+                if (!empty($link_hash) && $link_hash != $node) {

                     continue;
                     continue;

+                }

                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .

-                '<form action = "admin.php" method = "post">' .
+                '<strong><a id="upload_link" href="f.php?h='. jirafeau_escape($node) .'" title="' .
+                    t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a></strong><br/>';
+                echo t('TYPE') . ': ' . jirafeau_escape($l['mime_type']) . '<br/>';
+                echo t('SIZE') . ': ' . jirafeau_human_size($l['file_size']) . '<br>';
+                echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '<br/>';
+                echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '<br/>';
+                echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '<br/>';
+                echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
+                echo '</td><td>';
+                echo '<form method="post">' .

                 '<input type = "hidden" name = "action" value = "download"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<input type = "hidden" name = "action" value = "download"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .

-                '<input type = "submit" value = "' . $l['file_name'] . '" />' .
-                '</form>';
-                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>' . strftime ('%c', $l['upload_date']) . '</td>';
-                echo '<td>' . $l['ip'] . '</td>';
-                echo '<td>' .
-                '<form action = "admin.php" method = "post">' .
+                jirafeau_admin_csrf_field() .
+                '<input type = "submit" value = "' . t('DL') . '" />' .
+                '</form>' .
+                '<form method="post">' .

                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .

-                '<input type = "submit" value = "' . t('Del link') . '" />' .
+                jirafeau_admin_csrf_field() .
+                '<input type = "submit" value = "' . t('DEL_LINK') . '" />' .

                 '</form>' .
                 '</form>' .

-                '<form action = "admin.php" method = "post">' .
+                '<form method="post">' .

                 '<input type = "hidden" name = "action" value = "delete_file"/>' .
                 '<input type = "hidden" name = "action" value = "delete_file"/>' .

-                '<input type = "hidden" name = "md5" value = "' . $l['md5'] . '"/>' .
-                '<input type = "submit" value = "' . t('Del file and links') . '" />' .
+                '<input type = "hidden" name = "hash" value = "' . $l['hash'] . '"/>' .
+                jirafeau_admin_csrf_field() .
+                '<input type = "submit" value = "' . t('DEL_FILE_LINKS') . '" />' .

                 '</form>' .
                 '</td>';
                 echo '</tr>';
                 '</form>' .
                 '</td>';
                 echo '</tr>';


@@ -657,39 +712,34 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
  * Clean expired files.
  * @return number of cleaned files.
  */
  * Clean expired files.
  * @return number of cleaned files.
  */

-function
-jirafeau_admin_clean ()
+function jirafeau_admin_clean()

 {
     $count = 0;
     /* Get all links files. */
 {
     $count = 0;
     /* Get all links files. */

-    $stack = array (VAR_LINKS);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_LINKS);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {

                 continue;
                 continue;

-            
-            if (is_dir ($d . $node))
-            {
+            }
+
+            if (is_dir($d . $node)) {

                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';

-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {

                 /* Read link informations. */
                 /* Read link informations. */

-                $l = jirafeau_get_link (basename ($node));
-                if (!count ($l))
+                $l = jirafeau_get_link(basename($node));
+                if (!count($l)) {

                     continue;
                     continue;

-                $p = s2p ($l['md5']);
-                if ($l['time'] > 0 && $l['time'] < time () || // expired
-                    !file_exists (VAR_FILES . $p . $l['md5']) || // invalid
-                    !file_exists (VAR_FILES . $p . $l['md5'] . '_count')) // invalid
-                {
-                    jirafeau_delete_link ($node);
+                }
+                $p = s2p($l['hash']);
+                if ($l['time'] > 0 && $l['time'] < time() || // expired
+                    !file_exists(VAR_FILES . $p . $l['hash']) || // invalid
+                    !file_exists(VAR_FILES . $p . $l['hash'] . '_count')) { // invalid
+                    jirafeau_delete_link($node);

                     $count++;
                 }
             }
                     $count++;
                 }
             }


@@ -703,37 +753,32 @@ jirafeau_admin_clean ()
  * Clean old async transferts.
  * @return number of cleaned files.
  */
  * Clean old async transferts.
  * @return number of cleaned files.
  */

-function
-jirafeau_admin_clean_async ()
+function jirafeau_admin_clean_async()

 {
     $count = 0;
     /* Get all links files. */
 {
     $count = 0;
     /* Get all links files. */

-    $stack = array (VAR_ASYNC);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_ASYNC);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {

                 continue;
                 continue;

-            
-            if (is_dir ($d . $node))
-            {
+            }
+
+            if (is_dir($d . $node)) {

                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';

-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {

                 /* Read async informations. */
                 /* Read async informations. */

-                $a = jirafeau_get_async_ref (basename ($node));
-                if (!count ($a))
+                $a = jirafeau_get_async_ref(basename($node));
+                if (!count($a)) {

                     continue;
                     continue;

+                }

                 /* Delete transferts older than 1 hour. */
                 /* Delete transferts older than 1 hour. */

-                if (date ('U') - $a['last_edited'] > 3600)
-                {
-                    jirafeau_async_delete (basename ($node));
+                if (time() - $a['last_edited'] > 3600) {
+                    jirafeau_async_delete(basename($node));

                     $count++;
                 }
             }
                     $count++;
                 }
             }


@@ -745,47 +790,47 @@ jirafeau_admin_clean_async ()
  * Read async transfert informations
  * @return array containing informations.
  */
  * Read async transfert informations
  * @return array containing informations.
  */

-function
-jirafeau_get_async_ref ($ref)
+function jirafeau_get_async_ref($ref)

 {
 {

-    $out = array ();
-    $refinfos = VAR_ASYNC . s2p ("$ref") . "$ref";
+    $out = array();
+    $refinfos = VAR_ASYNC . s2p("$ref") . "$ref";

 
 

-    if (!file_exists ($refinfos))
+    if (!file_exists($refinfos)) {

         return $out;
         return $out;

-    
-    $c = file ($refinfos);
-    $out['file_name'] = trim ($c[0]);
-    $out['mime_type'] = trim ($c[1]);
-    $out['key'] = trim ($c[2], NL);
-    $out['time'] = trim ($c[3]);
-    $out['onetime'] = trim ($c[4]);
-    $out['ip'] = trim ($c[5]);
-    $out['last_edited'] = trim ($c[6]);
-    $out['next_code'] = trim ($c[7]);
+    }
+
+    $c = file($refinfos);
+    $out['file_name'] = trim($c[0]);
+    $out['mime_type'] = trim($c[1]);
+    $out['key'] = trim($c[2], NL);
+    $out['time'] = trim($c[3]);
+    $out['onetime'] = trim($c[4]);
+    $out['ip'] = trim($c[5]);
+    $out['last_edited'] = trim($c[6]);
+    $out['next_code'] = trim($c[7]);

     return $out;
 }
 
 /**
  * Delete async transfert informations
     return $out;
 }
 
 /**
  * Delete async transfert informations

-  */
-function
-jirafeau_async_delete ($ref)
+ */
+function jirafeau_async_delete($ref)

 {
 {

-    $p = s2p ("$ref");
-    if (file_exists (VAR_ASYNC . $p . $ref))
-        unlink (VAR_ASYNC . $p . $ref);
-    if (file_exists (VAR_ASYNC . $p . $ref . '_data'))
-        unlink (VAR_ASYNC . $p . $ref . '_data');
+    $p = s2p("$ref");
+    if (file_exists(VAR_ASYNC . $p . $ref)) {
+        unlink(VAR_ASYNC . $p . $ref);
+    }
+    if (file_exists(VAR_ASYNC . $p . $ref . '_data')) {
+        unlink(VAR_ASYNC . $p . $ref . '_data');
+    }

     $parse = VAR_ASYNC . $p;
     $scan = array();
     $parse = VAR_ASYNC . $p;
     $scan = array();

-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_ASYNC)) 
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    while (file_exists($parse)
+           && ($scan = scandir($parse))
+           && count($scan) == 2 // '.' and '..' folders => empty.
+           && basename($parse) != basename(VAR_ASYNC)) {
+        rmdir($parse);
+        $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);

     }
 }
 
     }
 }
 


@@ -796,43 +841,47 @@ 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)

 {
     $res = 'Error';
 
     /* Create temporary folder. */
     $ref;
     $p;
 {
     $res = 'Error';
 
     /* Create temporary folder. */
     $ref;
     $p;

-    $code = jirafeau_gen_random (4);
-    do
-    {
-        $ref = jirafeau_gen_random (32);
-        $p = VAR_ASYNC . s2p ($ref);
-    } while (file_exists ($p));
-    @mkdir ($p, 0755, true);
-    if (!file_exists ($p))
-    {
-        echo "Error";
+    $code = jirafeau_gen_random(4);
+    do {
+        $ref = jirafeau_gen_random(32);
+        $p = VAR_ASYNC . s2p($ref);
+    } while (file_exists($p));
+    @mkdir($p, 0755, true);
+    if (!file_exists($p)) {
+        echo 'Error';

         return;
     }
         return;
     }

-    
+
+    /* touch empty data file */
+    $w_path = $p . $ref . '_data';
+    touch($w_path);
+

     /* md5 password or empty */
     $password = '';
     /* md5 password or empty */
     $password = '';

-    if (!empty ($key))
-        $password = md5 ($key);
+    if (!empty($key)) {
+        $password = md5($key);
+    }

 
     /* Store informations. */
     $p .= $ref;
 
     /* Store informations. */
     $p .= $ref;

-    $handle = fopen ($p, 'w');
-    fwrite ($handle,
-            str_replace (NL, '', trim ($filename)) . NL .
-            str_replace (NL, '', trim ($type)) . NL . $password . NL .
+    $handle = fopen($p, 'w');
+    fwrite(
+        $handle,
+        str_replace(NL, '', trim($filename)) . NL .
+            str_replace(NL, '', trim($type)) . NL . $password . NL .

             $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .
             $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .

-            date ('U') . NL . $code . NL);
-    fclose ($handle);
+            time() . NL . $code . NL
+    );
+    fclose($handle);

 
     return $ref . NL . $code ;
 }
 
     return $ref . NL . $code ;
 }


@@ -842,48 +891,60 @@ 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
-jirafeau_async_push ($ref, $data, $code)
+function jirafeau_async_push($ref, $data, $code, $max_file_size)

 {
     /* Get async infos. */
 {
     /* Get async infos. */

-    $a = jirafeau_get_async_ref ($ref);
-    
+    $a = jirafeau_get_async_ref($ref);
+

     /* Check some errors. */
     /* Check some errors. */

-    if (count ($a) == 0
+    if (count($a) == 0

         || $a['next_code'] != "$code"
         || $a['next_code'] != "$code"

-        || empty ($data['tmp_name'])
-        || !is_uploaded_file ($data['tmp_name']))
-        return "Error";
-    
-    $p = s2p ($ref);
+        || empty($data['tmp_name'])
+        || !is_uploaded_file($data['tmp_name'])) {
+        return 'Error';
+    }
+
+    $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');
-    while (!feof ($r))
-    {
-        if (fwrite ($w, fread ($r, 1024)) === false)
-        {
-            fclose ($r);
-            fclose ($w);
-            jirafeau_async_delete ($ref);
-            return "Error";
+    $r = fopen($r_path, 'r');
+    $w = fopen($w_path, 'a');
+    while (!feof($r)) {
+        if (fwrite($w, fread($r, 1024)) === false) {
+            fclose($r);
+            fclose($w);
+            jirafeau_async_delete($ref);
+            return 'Error';

         }
     }
         }
     }

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

     /* Update async file. */
     /* Update async file. */

-    $code = jirafeau_gen_random (4);
-    $handle = fopen (VAR_ASYNC . $p . $ref, 'w');
-    fwrite ($handle,
-            $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .
+    $code = jirafeau_gen_random(4);
+    $handle = fopen(VAR_ASYNC . $p . $ref, 'w');
+    fwrite(
+        $handle,
+        $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .

             $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL .
             $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL .

-            date ('U') . NL . $code . NL);
-    fclose ($handle);
+            time() . NL . $code . NL
+    );
+    fclose($handle);

     return $code;
 }
 
     return $code;
 }
 


@@ -892,521 +953,476 @@ jirafeau_async_push ($ref, $data, $code)
   * @param $ref asynchronous upload reference
   * @param $code client code for this operation
   * @param $crypt boolean asking to crypt or not
   * @param $ref asynchronous upload reference
   * @param $code client code for this operation
   * @param $crypt boolean asking to crypt or not

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

   */
   */

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

 {
     /* Get async infos. */
 {
     /* Get async infos. */

-    $a = jirafeau_get_async_ref ($ref);
-    if (count ($a) == 0
-        || $a['next_code'] != "$code")
+    $a = jirafeau_get_async_ref($ref);
+    if (count($a) == 0
+        || $a['next_code'] != "$code") {

         return "Error";
         return "Error";

-    
+    }
+

     /* Generate link infos. */
     /* Generate link infos. */

-    $p = VAR_ASYNC . s2p ($ref) . $ref . "_data";
-    if (!file_exists($p))
-        return "Error";
+    $p = VAR_ASYNC . s2p($ref) . $ref . "_data";
+    if (!file_exists($p)) {
+        return 'Error';
+    }

 
     $crypted = false;
     $crypt_key = '';
 
     $crypted = false;
     $crypt_key = '';

-    if ($crypt == true && extension_loaded('mcrypt'))
-    {
-        $crypt_key = jirafeau_encrypt_file ($p, $p);
-        if (strlen($crypt_key) > 0)
+    if ($crypt == true && extension_loaded('mcrypt') == true) {
+        $crypt_key = jirafeau_encrypt_file($p, $p);
+        if (strlen($crypt_key) > 0) {

             $crypted = true;
             $crypted = true;

+        }

     }
 
     }
 

-    $md5 = md5_file ($p);
+    $hash = jirafeau_hash_file($file_hash_method, $p);

     $size = filesize($p);
     $size = filesize($p);

-    $np = s2p ($md5);
-    $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);
-    
+    $np = s2p($hash);
+    $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 . $hash)) {
+        rename($p, VAR_FILES . $np . $hash);
+    }
+

     /* Increment or create count file. */
     $counter = 0;
     /* Increment or create count file. */
     $counter = 0;

-    if (file_exists (VAR_FILES . $np . $md5 . '_count'))
-    {
-        $content = file (VAR_FILES . $np . $md5. '_count');
-        $counter = trim ($content[0]);
+    if (file_exists(VAR_FILES . $np . $hash . '_count')) {
+        $content = file(VAR_FILES . $np . $hash. '_count');
+        $counter = trim($content[0]);

     }
     $counter++;
     }
     $counter++;

-    $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w');
-    fwrite ($handle, $counter);
-    fclose ($handle);
-    
+    $handle = fopen(VAR_FILES . $np . $hash. '_count', 'w');
+    fwrite($handle, $counter);
+    fclose($handle);
+

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

-    $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 .
-            date ('U') . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
-    fclose ($handle);
-    $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";
-    
+    $link_tmp_name =  VAR_LINKS . $hash . 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 . $hash . NL . $a['onetime'] . NL .
+            time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O')
+    );
+    fclose($handle);
+    $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
+    $l = s2p("$hash_link");
+    if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
+        !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
+        return 'Error';
+    }
+

     /* Clean async upload. */
     /* Clean async upload. */

-    jirafeau_async_delete ($ref);
-    return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key);
+    jirafeau_async_delete($ref);
+    return $hash_link . NL . $delete_link_code . NL . urlencode($crypt_key);

 }
 
 }
 

-/**
-  * Delete a block.
-  * @param $id identifier of the block.
-  */
-function
-jirafeau_block_delete_ ($id)
+function jirafeau_crypt_create_iv($base, $size)

 {
 {

-    $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)) 
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    $iv = '';
+    while (strlen($iv) < $size) {
+        $iv = $iv . $base;

     }
     }

+    $iv = substr($iv, 0, $size);
+    return $iv;

 }
 
 /**
 }
 
 /**

-  * Create a file filled with zeros.
-  * @param $size size of the file.
-  * @return  a string corresponding to an id or the string "Error"
-  */
-function
-jirafeau_block_init ($size)
+ * 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 jirafeau_encrypt_file($fp_src, $fp_dst)

 {
 {

-    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))
-    {
-        echo "Error";
-        return;
+    $fs = filesize($fp_src);
+    if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true)) {
+        return '';

     }
 
     }
 

-    /* 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";
+    /* Prepare module. */
+    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
+    /* Generate key. */
+    $crypt_key = jirafeau_gen_random(10);
+    $hash_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
+    /* Init module. */
+    mcrypt_generic_init($m, $hash_key, $iv);
+    /* Crypt file. */
+    $r = fopen($fp_src, 'r');
+    $w = fopen($fp_dst, 'c');
+    while (!feof($r)) {
+        $enc = mcrypt_generic($m, fread($r, 1024));
+        if (fwrite($w, $enc) === false) {
+            return '';

         }
     }
         }
     }

-    fclose ($h);
-
-    /* Generate a write/delete code. */
-    $code = jirafeau_gen_random (12);
-
-    /* Add block infos. */
-    if (file_put_contents ($p . '_infos', date ('U') . NL . $size . NL . $code) === FALSE)
-    {
-        jirafeau_block_delete_ ($id);
-        return "Error";
-    }
-
-    return $id . NL . $code;
+    fclose($r);
+    fclose($w);
+    /* Cleanup. */
+    mcrypt_generic_deinit($m);
+    mcrypt_module_close($m);
+    return $crypt_key;

 }
 
 }
 

-/** Get block size in bytes.
-  * @param $id identifier of the block
-  * @return  block size in bytes
-  */
-function
-jirafeau_block_get_size ($id)
+/**
+ * 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 jirafeau_decrypt_file($fp_src, $fp_dst, $k)

 {
 {

-    $p = VAR_BLOCK . s2p ($id) . $id;
-    if (!file_exists ($p))
-        return "Error";
+    $fs = filesize($fp_src);
+    if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) {
+        return false;
+    }

 
 

-    /* 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";
+    /* Init module */
+    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
+    /* Extract key and iv. */
+    $crypt_key = $k;
+    $hash_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
+    /* Decrypt file. */
+    $r = fopen($fp_src, 'r');
+    $w = fopen($fp_dst, 'c');
+    while (!feof($r)) {
+        $dec = mdecrypt_generic($m, fread($r, 1024));
+        if (fwrite($w, $dec) === false) {
+            return false;

         }
     }
         }
     }

-    /* Remove data. */
-    elseif (date ('U') - $date >= JIRAFEAU_MONTH)
-    {
-        echo date ('U'). " $date ";
-        jirafeau_block_delete_ ($id);
-        return "Error";
-    }
-
-    return $block_size;
+    fclose($r);
+    fclose($w);
+    /* Cleanup. */
+    mcrypt_generic_deinit($m);
+    mcrypt_module_close($m);
+    return true;

 }
 
 /**
 }
 
 /**

-  * 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
-  */
-function
-jirafeau_block_read ($id, $start, $length)
+ * Check if Jirafeau is password protected for visitors.
+ * @return true if Jirafeau is password protected, false otherwise.
+ */
+function jirafeau_has_upload_password($cfg)

 {
 {

-    if (!ctype_digit ($start) || $start < 0
-        || !ctype_digit ($length) || $length <= 0)
-    {
-        echo "Error";
-        return;
-    }
+    return count($cfg['upload_password']) > 0;
+}

 
 

-    $p = VAR_BLOCK . s2p ($id) . $id;
-    if (!file_exists ($p))
-    {
-        echo "Error";
-        return;
+/**
+ * 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;

     }
     }

-
-    /* 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);
-            echo "Error";
-            return;
+    foreach ($cfg['upload_password'] as $p) {
+        if ($password == $p) {
+            return true;

         }
     }
         }
     }

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

 
 

-    if ($start + $length > $block_size)
-    {
-        echo "Error";
-        return;
+/**
+ * Test if the given IP is whitelisted by the given list.
+ *
+ * @param $allowedIpList array of allowed IPs
+ * @param $challengedIp IP to be challenged
+ * @return true if IP is authorized, false otherwise.
+ */
+function jirafeau_challenge_ip($allowedIpList, $challengedIp)
+{
+    foreach ($allowedIpList as $i) {
+        if ($i == $challengedIp) {
+            return true;
+        }
+        // CIDR test for IPv4 only.
+        if (strpos($i, '/') !== false) {
+            list($subnet, $mask) = explode('/', $i);
+            if ((ip2long($challengedIp) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) {
+                return true;
+            }
+        }

     }
     }

+    return false;
+}

 
 

-    /* Read content. */
-    header ('Content-Length: ' . $length);
-    header ('Content-Disposition: attachment');
+/**
+ * Check if Jirafeau has a restriction on the IP address for uploading.
+ * @return true if uploading is IP restricted, false otherwise.
+ */
+function jirafeau_upload_has_ip_restriction($cfg)
+{
+    return count($cfg['upload_ip']) > 0;
+}

 
 

-    $r = fopen ($p, 'r');
-    if (fseek ($r, $start) != 0)
-    {
-        echo "Error";
-        return;
-    }
-    $c = 1024;
-    for ($cnt = 0; $cnt < $length && !feof ($r); $cnt += 1024)
-    {
-        if ($length - $cnt < 1024)
-            $c = $length - $cnt;
-        print fread ($r, $c);
-        ob_flush();
+/**
+ * Test if visitor's IP is authorized to upload at all.
+ *
+ * @param $cfg configuration
+ * @param $challengedIp IP to be challenged
+ * @return true if IP is authorized, false otherwise.
+ */
+function jirafeau_challenge_upload_ip($cfg, $challengedIp)
+{
+    // If no IP address have been listed, allow upload from any IP
+    if (!jirafeau_upload_has_ip_restriction($cfg)) {
+        return true;

     }
     }

-    fclose ($r);
+    return jirafeau_challenge_ip($cfg['upload_ip'], $challengedIp);

 }
 
 /**
 }
 
 /**

-  * 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".
-  */
-function
-jirafeau_block_write ($id, $start, $data, $code)
+ * Test if visitor's IP is authorized to upload without a password.
+ *
+ * @param $cfg configuration
+ * @param $challengedIp IP to be challenged
+ * @return true if IP is authorized, false otherwise.
+ */
+function jirafeau_challenge_upload_ip_without_password($cfg, $challengedIp)

 {
 {

-    if (!ctype_digit ($start) || $start < 0
-        || strlen ($code) == 0)
-        return "Error";
+    return jirafeau_challenge_ip($cfg['upload_ip_nopassword'], $challengedIp);
+}

 
 

-    $p = VAR_BLOCK . s2p ($id) . $id;
-    if (!file_exists ($p))
-        return "Error";
+/**
+ * Test if visitor's IP is authorized or password is supplied and authorized
+ * @param $ip IP to be challenged
+ * @param $password password to be challenged
+ * @return true if access is valid, false otherwise.
+ */
+function jirafeau_challenge_upload($cfg, $ip, $password)
+{
+    return jirafeau_challenge_upload_ip_without_password($cfg, $ip) ||
+            (!jirafeau_has_upload_password($cfg) && !jirafeau_upload_has_ip_restriction($cfg)) ||
+            (jirafeau_challenge_upload_password($cfg, $password) && jirafeau_challenge_upload_ip($cfg, $ip));
+}
+
+/** 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']);
+}

 
 

-    /* 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";
+/**
+ * Generate IP list from HTTP headers generated by a proxy
+ * @return  array of IP strings
+ */
+function get_ip_list_http_forwarded()
+{
+    $ip_list = array();
+    if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $l = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+        if ($l === false) {
+            return array();
+        }
+        foreach ($l as $ip) {
+            array_push($ip_list, preg_replace('/\s+/', '', $ip));

         }
     }
         }
     }

-    /* Remove data. */
-    elseif (date ('U') - $date >= JIRAFEAU_MONTH)
-    {
-        jirafeau_block_delete_ ($id);
-        return "Error";
+    if (!empty($_SERVER['http_X_forwarded_for'])) {
+        $l = explode(',', $_SERVER['http_X_forwarded_for']);
+        foreach ($l as $ip) {
+            // Separate IP from port
+            $ipa = explode(':', $ip);
+            if ($ipa === false) {
+                continue;
+            }
+            $ip = $ipa[0];
+            array_push($ip_list, preg_replace('/\s+/', '', $ip));
+        }

     }
     }

+    return $ip_list;
+}

 
 

-    /* Check code. */
-    if ($stored_code != $code)
-    {
-        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;

     }
 
     }
 

-    /* 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');
-
-    /* Open Block. */
-    $w = fopen ($p, 'r+');
-    if (fseek ($w, $start) != 0)
-        return "Error";
+    $ip_list = get_ip_list_http_forwarded();
+    if (count($ip_list) == 0) {
+        return $remote;
+    }

 
 

-    /* 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";
+    foreach ($cfg['proxy_ip'] as $proxy_ip) {
+        if ($remote != $proxy_ip) {
+            continue;
+        }
+        // Take the last IP (the one which has been set by the defined proxy).
+        return end($ip_list);
+    }
+    return $remote;

 }
 
 /**
 }
 
 /**

-  * Delete a block.
-  * @param $id identifier of the block.
-  * @param $code code to allow writing.
-  * @return  string "Ok" or string "Error".
-  */
-function
-jirafeau_block_delete ($id, $code)
+ * Convert hexadecimal string to base64
+ */
+function hex_to_base64($hex)

 {
 {

-    $p = VAR_BLOCK . s2p ($id) . $id;
-
-    if (!file_exists ($p))
-        return "Error";
+    $b = '';
+    foreach (str_split($hex, 2) as $pair) {
+        $b .= chr(hexdec($pair));
+    }
+    return base64_encode($b);
+}

 
 

-    $f = file ($p . '_infos');
-    $date = trim ($f[0]);
-    $block_size = trim ($f[1]);
-    $stored_code = trim ($f[2]);
+/**
+ * Replace markers in templates.
+ *
+ * Available markers have the scheme "###MARKERNAME###".
+ *
+ * @param $content string Template text with markers
+ * @param $htmllinebreaks boolean Convert linebreaks to BR-Tags
+ * @return Template with replaced markers
+ */
+function jirafeau_replace_markers($content, $htmllinebreaks = false)
+{
+    $patterns = array(
+        '/###ORGANISATION###/',
+        '/###CONTACTPERSON###/',
+        '/###WEBROOT###/'
+    );
+    $replacements = array(
+        $GLOBALS['cfg']['organisation'],
+        $GLOBALS['cfg']['contactperson'],
+        $GLOBALS['cfg']['web_root']
+    );
+    $content = preg_replace($patterns, $replacements, $content);
+
+    if (true === $htmllinebreaks) {
+        $content = nl2br($content);
+    }

 
 

-    if ($code != $stored_code)
-        return "Error";
+    return $content;
+}

 
 

-    jirafeau_block_delete_ ($id);
-    return "Ok";
+function jirafeau_escape($string)
+{
+    return htmlspecialchars($string, ENT_QUOTES);

 }
 
 }
 

-/**
- * Clean old unused blocks.
- * @return number of cleaned blocks.
- */
-function
-jirafeau_admin_clean_block ()
+function jirafeau_admin_session_start()

 {
 {

-    $count = 0;
-    /* Get all blocks. */
-    $stack = array (VAR_BLOCK);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0)
-                continue;
+    $_SESSION['admin_auth'] = true;
+    $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true));
+}

 
 

-            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++;
-                }
-            }
-        }
-    }
-    return $count;
+function jirafeau_admin_session_end()
+{
+    $_SESSION = array();
+    session_destroy();

 }
 
 }
 

-function
-jirafeau_crypt_create_iv($base, $size)
+function jirafeau_admin_session_logged()

 {
 {

-    $iv = '';
-    while (strlen ($iv) < $size)
-        $iv = $iv . $base;
-    $iv = substr($iv, 0, $size);
-    return $iv;
+    return isset($_SESSION['admin_auth']) &&
+           isset($_SESSION['admin_csrf']) &&
+           isset($_POST['admin_csrf']) &&
+           $_SESSION['admin_auth'] === true &&
+           $_SESSION['admin_csrf'] === $_POST['admin_csrf'];

 }
 
 }
 

-/**
- * 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
-jirafeau_encrypt_file ($fp_src, $fp_dst)
+function jirafeau_admin_csrf_field()

 {
 {

-    $fs = filesize ($fp_src);
-    if ($fs === false || $fs == 0 || !extension_loaded('mcrypt'))
-        return '';
+    return "<input type='hidden' name='admin_csrf' value='". $_SESSION['admin_csrf'] . "'/>";
+}

 
 

-    /* 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))
-    {
-        $enc = mcrypt_generic($m, fread ($r, 1024));
-        if (fwrite ($w, $enc) === false)
-            return '';
+function jirafeau_dir_size($dir)
+{
+    $size = 0;
+    foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $entry) {
+        $size += is_file($entry) ? filesize($entry) : jirafeau_dir_size($entry);

     }
     }

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

 }
 
 }
 

-/**
- * 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
-jirafeau_decrypt_file ($fp_src, $fp_dst, $k)
+function jirafeau_export_cfg($cfg)

 {
 {

-    $fs = filesize ($fp_src);
-    if ($fs === false || $fs == 0 || !extension_loaded('mcrypt'))
-        return false;
+    $content = '<?php' . NL;
+    $content .= '/* This file was generated by the install process. ' .
+               'You can edit it. Please see config.original.php to understand the ' .
+               'configuration items. */' . NL;
+    $content .= '$cfg = ' . var_export($cfg, true) . ';';

 
 

-    /* 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))
-    {
-        $dec = mdecrypt_generic($m, fread ($r, 1024));
-        if (fwrite ($w, $dec) === false)
-            return false;
+    $fileWrite = file_put_contents(JIRAFEAU_CFG, $content);
+
+    if (false === $fileWrite) {
+        jirafeau_fatal_error(t('Can not write local configuration file'));

     }
     }

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

 }
 
 }
 

-/**
- * Check if Jirafeau is password protected for visitors.
- * @return true if Jirafeau is password protected, false otherwise.
- */
-function jirafeau_has_upload_password ($cfg)
+function jirafeau_mkdir($path)

 {
 {

-    return count ($cfg['upload_password']) > 0;
+    return !(!file_exists($path) && !@mkdir($path, 0755));

 }
 
 /**
 }
 
 /**

- * Challenge password for a visitor.
- * @param $password password to be challenged
- * @return true if password is valid, false otherwise.
+ * Returns true whether the path is writable or we manage to make it
+ * so, which essentially is the same thing.
+ * @param $path is the file or directory to be tested.
+ * @return true if $path is writable.

  */
  */

-function jirafeau_challenge_upload_password ($cfg, $password)
+function jirafeau_is_writable($path)

 {
 {

-    if (!jirafeau_has_upload_password($cfg))
-        return false;
-    forEach ($cfg['upload_password'] as $p)
-        if ($password == $p)
-            return true;
-    error_log("password not found $password");
-    return false;
+    /* "@" gets rid of error messages. */
+    return is_writable($path) || @chmod($path, 0777);

 }
 
 }
 

+function jirafeau_check_var_dir($path)
+{
+    $mkdir_str1 = t('CANNOT_CREATE_DIR') . ':';
+    $mkdir_str2 = t('MANUAL_CREATE');
+    $write_str1 = t('DIR_NOT_W') . ':';
+    $write_str2 = t('You should give the write permission to the web server on ' .
+                    'this directory.');
+    $solution_str = t('HERE_SOLUTION') . ':';
+
+    if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) {
+        return array('has_error' => true,
+                      'why' => $mkdir_str1 . '<br /><code>' .
+                               $path . '</code><br />' . $solution_str .
+                               '<br />' . $mkdir_str2);
+    }
+
+    foreach (array('files', 'links', 'async') as $subdir) {
+        $subpath = $path.$subdir;
+
+        if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
+            return array('has_error' => true,
+                          'why' => $mkdir_str1 . '<br /><code>' .
+                                   $subpath . '</code><br />' . $solution_str .
+                                   '<br />' . $mkdir_str2);
+        }
+    }
+
+    return array('has_error' => false, 'why' => '');
+}
+
+function jirafeau_add_ending_slash($path)
+{
+    return $path . ((substr($path, -1) == '/') ? '' : '/');
+}