[BUGFIX] Limit upload chunk size to a reasonable value

[jirafeau_mojo42.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 85651bafa85a5e486f44eba4745c31de5e2cf7bf..4dcf5de235f94cb35c5670c17a495c8e26d51c93 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -2,7 +2,7 @@
 /*
  *  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) 2015  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
  *  Copyright (C) 2015  Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
  *
  *  This program is free software: you can redistribute it and/or modify


@@ -20,14 +20,21 @@
  */
 
 /**
  */
 
 /**

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

  * @return path finishing with a '/'
  */
 function s2p($s)
 {
  * @return path finishing with a '/'
  */
 function s2p($s)
 {

+    $block_size = 8;

     $p = '';
     for ($i = 0; $i < strlen($s); $i++) {
     $p = '';
     for ($i = 0; $i < strlen($s); $i++) {

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

     }
     return $p;
 }
     }
     return $p;
 }


@@ -61,16 +68,16 @@ function base_16_to_64($num)
     # Convert long hex string to bin.
     $size = strlen($num);
     for ($i = 0; $i < $size; $i++) {
     # Convert long hex string to bin.
     $size = strlen($num);
     for ($i = 0; $i < $size; $i++) {

-        $b .= $hex2bin{hexdec($num{$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) {

-        $o = $m{bindec(substr($b, $i, 6))} . $o;
+        $o = $m[bindec(substr($b, $i, 6))] . $o;

     }
     # Some few bits remaining ?
     if ($i < 0 && $i > -6) {
     }
     # Some few bits remaining ?
     if ($i < 0 && $i > -6) {

-        $o = $m{bindec(substr($b, 0, $i + 6))} . $o;
+        $o = $m[bindec(substr($b, 0, $i + 6))] . $o;

     }
     return $o;
 }
     }
     return $o;
 }


@@ -120,6 +127,21 @@ function jirafeau_human_size($octets)
     return round($o, 1) . $u[$p];
 }
 
     return round($o, 1) . $u[$p];
 }
 

+// Convert UTC timestamp to a datetime field
+function jirafeau_get_datetimefield($timestamp)
+{
+    $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");
 function jirafeau_clean_rm_link($link)
 {
     $p = s2p("$link");


@@ -137,10 +159,10 @@ function jirafeau_clean_rm_link($link)
     }
 }
 
     }
 }
 

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

 {
 {

-    $p = s2p("$md5");
-    $f = VAR_FILES . $p . $md5;
+    $p = s2p("$hash");
+    $f = VAR_FILES . $p . $hash;

     if (file_exists($f) && is_file($f)) {
         unlink($f);
     }
     if (file_exists($f) && is_file($f)) {
         unlink($f);
     }


@@ -170,12 +192,16 @@ function jirafeau_ini_to_bytes($value)
     switch (strtoupper($modifier)) {
     case 'P':
         $bytes *= 1024;
     switch (strtoupper($modifier)) {
     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;
     }


@@ -188,8 +214,10 @@ function jirafeau_ini_to_bytes($value)
  */
 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'))
+    );

 }
 
 /**
 }
 
 /**


@@ -198,9 +226,22 @@ function jirafeau_get_max_upload_size_bytes()
  */
 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());
+}
+
+/**
+ * get the maximal upload size for a data chunk in async uploads
+ * @param max_upload_chunk_size_bytes
+ */
+function jirafeau_get_max_upload_chunk_size_bytes($max_upload_chunk_size_bytes = 0)
+{
+    if ($max_upload_chunk_size_bytes > 0) {
+        return min(
+            jirafeau_get_max_upload_size_bytes(),
+            $max_upload_chunk_size_bytes
+        );
+    }
+    return jirafeau_get_max_upload_size_bytes();

 }
 
 /**
 }
 
 /**


@@ -241,31 +282,31 @@ function jirafeau_delete_link($link)
 
     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');
+    if (file_exists(VAR_FILES . $p . $hash. '_count')) {
+        $content = file(VAR_FILES . $p . $hash. '_count');

         $counter = trim($content[0]);
     }
     $counter--;
 
     if ($counter >= 1) {
         $counter = trim($content[0]);
     }
     $counter--;
 
     if ($counter >= 1) {

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

         fwrite($handle, $counter);
         fclose($handle);
     }
 
     if ($counter == 0) {
         fwrite($handle, $counter);
         fclose($handle);
     }
 
     if ($counter == 0) {

-        jirafeau_clean_rm_file($md5);
+        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. */


@@ -288,17 +329,69 @@ function jirafeau_delete_file($md5)
                 if (!count($l)) {
                     continue;
                 }
                 if (!count($l)) {
                     continue;
                 }

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

                     $count++;
                     jirafeau_delete_link($node);
                 }
             }
         }
     }
                     $count++;
                     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[]


@@ -313,7 +406,7 @@ function 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'])) {
         return (array(
 {
     if (empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) {
         return (array(


@@ -340,73 +433,75 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
         }
     }
 
         }
     }
 

-    /* file informations */
-    $md5 = md5_file($file['tmp_name']);
+    /* file information */
+    $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;
     $name = str_replace(NL, '', trim($file['name']));
     $mime_type = $file['type'];
     $size = $file['size'];
 
     /* does file already exist ? */
     $rc = false;

-    $p = s2p("$md5");
-    if (file_exists(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))
         $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)) {
+            && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $hash)) {

         $rc = true;
     }
     if (!$rc) {
         return (array(
                  'error' =>
                    array('has_error' => true,
         $rc = true;
     }
     if (!$rc) {
         return (array(
                  'error' =>
                    array('has_error' => true,

-                          'why' => t('Internal error during file creation.')),
+                          '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');
+    if (file_exists(VAR_FILES . $p . $hash . '_count')) {
+        $content = file(VAR_FILES . $p . $hash. '_count');

         $counter = trim($content[0]);
     }
     $counter++;
         $counter = trim($content[0]);
     }
     $counter++;

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

     fwrite($handle, $counter);
     fclose($handle);
 
     /* Create delete code. */
     $delete_link_code = jirafeau_gen_random(5);
 
     fwrite($handle, $counter);
     fclose($handle);
 
     /* Create delete code. */
     $delete_link_code = jirafeau_gen_random(5);
 

-    /* md5 password or empty. */
+    /* hash 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 . $hash . rand(0, 10000) . '.tmp';

     $handle = fopen($link_tmp_name, 'w');
     $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 . time() .
-            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+    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);
     fclose($handle);

-    $md5_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
-    $l = s2p("$md5_link");
+    $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) ||
     if (!@mkdir(VAR_LINKS . $l, 0755, true) ||

-        !rename($link_tmp_name, VAR_LINKS . $l . $md5_link)) {
+        !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {

         if (file_exists($link_tmp_name)) {
             unlink($link_tmp_name);
         }
 
         $counter--;
         if ($counter >= 1) {
         if (file_exists($link_tmp_name)) {
             unlink($link_tmp_name);
         }
 
         $counter--;
         if ($counter >= 1) {

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

             fwrite($handle, $counter);
             fclose($handle);
         } else {
             fwrite($handle, $counter);
             fclose($handle);
         } else {

-            jirafeau_clean_rm_file($md5_link);
+            jirafeau_clean_rm_file($hash_link);

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


@@ -416,7 +511,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
                  'delete_link' => '');
     }
     return array( 'error' => $noerr,
                  'delete_link' => '');
     }
     return array( 'error' => $noerr,

-                  'link' => $md5_link,
+                  'link' => $hash_link,

                   'delete_link' => $delete_link_code,
                   'crypt_key' => $crypt_key);
 }
                   'delete_link' => $delete_link_code,
                   'crypt_key' => $crypt_key);
 }


@@ -429,10 +524,15 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
 function jirafeau_is_viewable($mime)
 {
     if (!empty($mime)) {
 function jirafeau_is_viewable($mime)
 {
     if (!empty($mime)) {

-        /* Actually, verify if mime-type is an image or a text. */
-        $viewable = array('image', 'text', 'video', 'audio');
+        $viewable = array('image', 'video', 'audio');

         $decomposed = explode('/', $mime);
         $decomposed = explode('/', $mime);

-        return in_array($decomposed[0], $viewable);
+        if (in_array($decomposed[0], $viewable) && strpos($mime, 'image/svg+xml') === false) {
+            return true;
+        }
+        $viewable = array('text/plain');
+        if (in_array($mime, $viewable)) {
+            return true;
+        }

     }
     return false;
 }
     }
     return false;
 }


@@ -485,26 +585,31 @@ function check_errors($cfg)
         exit;
     }
 
         exit;
     }
 

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

     /* Checking for errors. */
     if (!is_writable(VAR_FILES)) {
     /* Checking for errors. */
     if (!is_writable(VAR_FILES)) {

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

     }
 
     if (!is_writable(VAR_LINKS)) {
     }
 
     if (!is_writable(VAR_LINKS)) {

-        add_error(t('The link directory is not writable!'), VAR_LINKS);
+        add_error(t('LINK_DIR_W'), VAR_LINKS);

     }
 
     if (!is_writable(VAR_ASYNC)) {
     }
 
     if (!is_writable(VAR_ASYNC)) {

-        add_error(t('The async directory is not 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 information
+ * @return array containing information.

  */
 function jirafeau_get_link($hash)
 {
  */
 function jirafeau_get_link($hash)
 {


@@ -521,7 +626,7 @@ function jirafeau_get_link($hash)
     $out['file_size'] = trim($c[2]);
     $out['key'] = trim($c[3], NL);
     $out['time'] = trim($c[4]);
     $out['file_size'] = trim($c[2]);
     $out['key'] = trim($c[3], NL);
     $out['time'] = trim($c[4]);

-    $out['md5'] = trim($c[5]);
+    $out['hash'] = trim($c[5]);

     $out['onetime'] = trim($c[6]);
     $out['upload_date'] = trim($c[7]);
     $out['ip'] = trim($c[8]);
     $out['onetime'] = trim($c[6]);
     $out['upload_date'] = trim($c[7]);
     $out['ip'] = trim($c[8]);


@@ -538,28 +643,22 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
 {
     echo '<fieldset><legend>';
     if (!empty($name)) {
 {
     echo '<fieldset><legend>';
     if (!empty($name)) {

-        echo t('Filename') . ": $name ";
+        echo t('FILENAME') . ": " . jirafeau_escape($name);

     }
     if (!empty($file_hash)) {
     }
     if (!empty($file_hash)) {

-        echo t('file') . ": $file_hash ";
+        echo t('FILE') . ": " . jirafeau_escape($file_hash);

     }
     if (!empty($link_hash)) {
     }
     if (!empty($link_hash)) {

-        echo t('link') . ": $link_hash ";
+        echo t('LINK') . ": " . jirafeau_escape($link_hash);

     }
     if (empty($name) && empty($file_hash) && empty($link_hash)) {
     }
     if (empty($name) && empty($file_hash) && empty($link_hash)) {

-        echo t('List all files');
+        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. */


@@ -575,56 +674,53 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
             } elseif (is_file($d . $node)) {
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
             } elseif (is_file($d . $node)) {

-                /* Read link informations. */
+                /* Read link information. */

                 $l = jirafeau_get_link($node);
                 if (!count($l)) {
                     continue;
                 }
 
                 /* Filter. */
                 $l = jirafeau_get_link($node);
                 if (!count($l)) {
                     continue;
                 }
 
                 /* Filter. */

-                if (!empty($name) && !preg_match("/$name/i", htmlspecialchars($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;
                 }
                 if (!empty($link_hash) && $link_hash != $node) {
                     continue;
                 }
                     continue;
                 }
                 if (!empty($link_hash) && $link_hash != $node) {
                     continue;
                 }

-                /* Print link informations. */
+                /* Print link information. */

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

-                '<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>';
-                if ($l['onetime'] == 'O') {
-                    echo 'Y';
-                } else {
-                    echo 'N';
+                '<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/>';
+                if (strlen($l['ip']) > 0) {
+                    echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';

                 }
                 }

-                echo '</td>';
-                echo '<td>' . strftime('%c', $l['upload_date']) . '</td>';
-                echo '<td>' . $l['ip'] . '</td>';
-                echo '<td>' .
-                '<form method="post">' .
+                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 = "' . t('Download') . '" />' .
+                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 . '"/>' .
                 '</form>' .
                 '<form method="post">' .
                 '<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 method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_file"/>' .
                 '</form>' .
                 '<form method="post">' .
                 '<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>';


@@ -656,15 +752,15 @@ function jirafeau_admin_clean()
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
             } elseif (is_file($d . $node)) {
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
             } elseif (is_file($d . $node)) {

-                /* Read link informations. */
+                /* Read link information. */

                 $l = jirafeau_get_link(basename($node));
                 if (!count($l)) {
                     continue;
                 }
                 $l = jirafeau_get_link(basename($node));
                 if (!count($l)) {
                     continue;
                 }

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

                 if ($l['time'] > 0 && $l['time'] < time() || // expired
                 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
+                    !file_exists(VAR_FILES . $p . $l['hash']) || // invalid
+                    !file_exists(VAR_FILES . $p . $l['hash'] . '_count')) { // invalid

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


@@ -676,7 +772,7 @@ function jirafeau_admin_clean()
 
 
 /**
 
 
 /**

- * Clean old async transferts.
+ * Clean old async transfers.

  * @return number of cleaned files.
  */
 function jirafeau_admin_clean_async()
  * @return number of cleaned files.
  */
 function jirafeau_admin_clean_async()


@@ -697,12 +793,12 @@ function jirafeau_admin_clean_async()
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
             } elseif (is_file($d . $node)) {
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
             } elseif (is_file($d . $node)) {

-                /* Read async informations. */
+                /* Read async information. */

                 $a = jirafeau_get_async_ref(basename($node));
                 if (!count($a)) {
                     continue;
                 }
                 $a = jirafeau_get_async_ref(basename($node));
                 if (!count($a)) {
                     continue;
                 }

-                /* Delete transferts older than 1 hour. */
+                /* Delete transfers older than 1 hour. */

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


@@ -712,9 +808,108 @@ function jirafeau_admin_clean_async()
     }
     return $count;
 }
     }
     return $count;
 }

+
+/**
+ * Better strval function for debug purposes
+ */
+function jirafeau_strval($value)
+{
+    if (gettype($value) == "boolean") {
+        return $value ? 'true' : 'false';
+    }
+    return strval($value);
+}
+

 /**
 /**

- * Read async transfert informations
- * @return array containing informations.
+ * Show file/folder permissions
+ */
+function jirafeau_fileperms($path)
+{
+    $out = substr(sprintf("%o", @fileperms($path)), -4) . ", ";
+    $out .= "read " . (is_readable($path) ? "OK" : "KO") . ", ";
+    $out .= "write " . (is_writable($path) ? "OK" : "KO");
+    return $out;
+}
+
+/**
+ * Show some useful informations for bug reporting.
+ */
+function jirafeau_admin_bug_report($cfg)
+{
+    $out = "<fieldset><legend>" . t('REPORTING_AN_ISSUE') . "</legend>";
+    $out .= "If you have a problem related to Jirafeau, please <a href='https://gitlab.com/mojo42/Jirafeau/-/issues'>open an issue</a>, explain your problem in english and copy-paste the following content:<br/><br/><code>";
+
+    $out .= "# Jirafeau<br/>";
+    $out .= "- version: " . JIRAFEAU_VERSION . "<br/>";
+    $jirafeau_options = [
+        'debug',
+        'file_hash',
+        'litespeed_workaround',
+        'store_uploader_ip',
+        'installation_done',
+        'enable_crypt',
+        'preview',
+        'maximal_upload_size',
+        'store_uploader_ip',
+        'max_upload_chunk_size_bytes'
+    ];
+    foreach ($jirafeau_options as &$o) {
+        $v = $cfg[$o];
+        $out .= "- $o: " . jirafeau_strval($v) . " (" . gettype($v) . ")<br/>";
+    }
+    $out .= "<br/>";
+
+    $out .= "# PHP options<br/>";
+    $out .= "- php version: " . phpversion() . "<br/>";
+    $out .= "- mcrypt version: " . phpversion('mcrypt') . "<br/>";
+    $php_options =  [
+        'post_max_size',
+        'upload_max_filesize',
+        'safe_mode',
+        'max_execution_time',
+        'max_input_time'
+    ];
+    foreach ($php_options as &$o) {
+        $v = ini_get($o);
+        $out .= "- $o: " . jirafeau_strval($v) . " (" . gettype($v). ")<br/>";
+    }
+    $out .= "- can set_time_limit: " . (set_time_limit(0) ? "yes" : "no") . "<br/>";
+    $out .= "<br/>";
+
+    $out .= "# File permissions<br/>";
+    $out .= "- 'var' folder permissions: " . jirafeau_fileperms($cfg['var_root']) . "<br/>";
+    $out .= "- 'file' folder permissions: " . jirafeau_fileperms(VAR_FILES) . "<br/>";
+    $out .= "- 'links' folder permissions: " . jirafeau_fileperms(VAR_LINKS) . "<br/>";
+    $out .= "- 'async' folder permissions: " . jirafeau_fileperms(VAR_ASYNC) . "<br/>";
+    $out .= "<br/>";
+
+    $out .= "# Server details<br/>";
+    $out .= "- server software: " . $_SERVER["SERVER_SOFTWARE"] . "<br/>";
+    $out .= "<br/>";
+
+    $out .= "# OS details<br/>";
+    $out .= "- OS: " . php_uname() . "<br/>";
+    $out .= "<br/>";
+
+    $out .= "# Browser details<br/>";
+    $out .= "<script type='text/javascript' lang='Javascript'>
+        // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+        document.write('- html5 support: ' + (check_html5_file_api() ? 'yes' : 'no') + '<br/>');
+        document.write('- user agent: ' + navigator.userAgent + '<br/>');
+        // @license-end
+        </script>";
+    $out .= "<br/>";
+
+    $out .= "# Memory<br/>";
+    $out .= "- memory_get_peak_usage: " . jirafeau_human_size(memory_get_peak_usage()) . "<br/>";
+
+    $out .= "</code></fieldset>";
+    return $out;
+}
+
+/**
+ * Read async transfer information
+ * @return array containing information.

  */
 function jirafeau_get_async_ref($ref)
 {
  */
 function jirafeau_get_async_ref($ref)
 {


@@ -738,7 +933,7 @@ function jirafeau_get_async_ref($ref)
 }
 
 /**
 }
 
 /**

- * Delete async transfert informations
+ * Delete async transfer information

  */
 function jirafeau_async_delete($ref)
 {
  */
 function jirafeau_async_delete($ref)
 {


@@ -762,17 +957,15 @@ function jirafeau_async_delete($ref)
 
 /**
   * Init a new asynchronous upload.
 
 /**
   * Init a new asynchronous upload.

-  * @param $finename Name of the file to send
+  * @param $filename Name of the file to send

   * @param $one_time One time upload parameter
   * @param $key eventual password (or blank)
   * @param $time time limit
   * @param $ip ip address of the client
   * @param $one_time One time upload parameter
   * @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 a string starting with '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;
     /* Create temporary folder. */
     $ref;
     $p;


@@ -783,24 +976,29 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
     } while (file_exists($p));
     @mkdir($p, 0755, true);
     if (!file_exists($p)) {
     } while (file_exists($p));
     @mkdir($p, 0755, true);
     if (!file_exists($p)) {

-        echo 'Error';
-        return;
+        return 'Error: cannot create async folder.';

     }
 
     }
 

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

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

-    /* Store informations. */
+    /* Store information. */

     $p .= $ref;
     $handle = fopen($p, 'w');
     $p .= $ref;
     $handle = fopen($p, 'w');

-    fwrite($handle,
-            str_replace(NL, '', trim($filename)) . NL .
+    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 .
             str_replace(NL, '', trim($type)) . NL . $password . NL .
             $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .

-            time() . NL . $code . NL);
+            time() . NL . $code . NL
+    );

     fclose($handle);
 
     return $ref . NL . $code ;
     fclose($handle);
 
     return $ref . NL . $code ;


@@ -812,7 +1010,7 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
   * @param $file piece of data
   * @param $code client code for this operation
   * @param $max_file_size maximum allowed file size
   * @param $file piece of data
   * @param $code client code for this operation
   * @param $max_file_size maximum allowed file size

-  * @return a string containing a next code to use or the string "Error"
+  * @return a string containing a next code to use or a string starting with 'Error'

   */
 function jirafeau_async_push($ref, $data, $code, $max_file_size)
 {
   */
 function jirafeau_async_push($ref, $data, $code, $max_file_size)
 {


@@ -820,11 +1018,22 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size)
     $a = jirafeau_get_async_ref($ref);
 
     /* Check some errors. */
     $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'])) {
-        return 'Error';
+    if (count($a) == 0) {
+        return "Error: cannot find transfer";
+    }
+    if ($a['next_code'] != "$code") {
+        return "Error: bad transfer code";
+    }
+    if ($data['error'] != UPLOAD_ERR_OK) {
+        // Check error code in https://www.php.net/manual/en/features.file-upload.errors.php
+        $data_details = print_r($data, true);
+        return "Error: upload error: {$data_details}";
+    }
+    if (empty($data['tmp_name'])) {
+        return "Error: missing tmp_name";
+    }
+    if (!is_uploaded_file($data['tmp_name'])) {
+        return "Error: tmp_name may not be uploaded";

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


@@ -837,7 +1046,7 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size)
     if ($max_file_size > 0 &&
         filesize($r_path) + filesize($w_path) > $max_file_size * 1024 * 1024) {
         jirafeau_async_delete($ref);
     if ($max_file_size > 0 &&
         filesize($r_path) + filesize($w_path) > $max_file_size * 1024 * 1024) {
         jirafeau_async_delete($ref);

-        return 'Error';
+        return "Error: file size is above upload limit";

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


@@ -848,7 +1057,7 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size)
             fclose($r);
             fclose($w);
             jirafeau_async_delete($ref);
             fclose($r);
             fclose($w);
             jirafeau_async_delete($ref);

-            return 'Error';
+            return "Error: cannot write file";

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


@@ -858,35 +1067,37 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size)
     /* 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');

-    fwrite($handle,
-            $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .
+    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 .

-            time() . NL . $code . NL);
+            time() . NL . $code . NL
+    );

     fclose($handle);
     return $code;
 }
 
 /**
     fclose($handle);
     return $code;
 }
 
 /**

-  * Finalyze an asynchronous upload.
+  * Finalize an asynchronous upload.

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

-  * @return a string containing the download reference followed by a delete code or the string 'Error'
+  * @return a string containing the download reference followed by a delete code or a string starting with '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. */
     $a = jirafeau_get_async_ref($ref);
     if (count($a) == 0
         || $a['next_code'] != "$code") {
 {
     /* Get async infos. */
     $a = jirafeau_get_async_ref($ref);
     if (count($a) == 0
         || $a['next_code'] != "$code") {

-        return "Error";
+        return "Error: bad code for ending transfer";

     }
 
     /* 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: referenced file does not exist";

     }
 
     $crypted = false;
     }
 
     $crypted = false;


@@ -898,48 +1109,52 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length)
         }
     }
 
         }
     }
 

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

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

-    $np = s2p($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);
     }
     $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 . $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');
+    if (file_exists(VAR_FILES . $np . $hash . '_count')) {
+        $content = file(VAR_FILES . $np . $hash. '_count');

         $counter = trim($content[0]);
     }
     $counter++;
         $counter = trim($content[0]);
     }
     $counter++;

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

     fwrite($handle, $counter);
     fclose($handle);
 
     /* Create link. */
     fwrite($handle, $counter);
     fclose($handle);
 
     /* Create link. */

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

     $handle = fopen($link_tmp_name, 'w');
     $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 .
-            time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+    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);
     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";
+    $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)) {
+        return "Error: cannot create folder in LINKS";
+    }
+    if (!rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
+        return "Error: cannot rename file in LINKS";

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

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

 }
 
 function jirafeau_crypt_create_iv($base, $size)
 }
 
 function jirafeau_crypt_create_iv($base, $size)


@@ -969,10 +1184,10 @@ function jirafeau_encrypt_file($fp_src, $fp_dst)
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Generate key. */
     $crypt_key = jirafeau_gen_random(10);
     $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));
+    $hash_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));

     /* Init module. */
     /* Init module. */

-    mcrypt_generic_init($m, $md5_key, $iv);
+    mcrypt_generic_init($m, $hash_key, $iv);

     /* Crypt file. */
     $r = fopen($fp_src, 'r');
     $w = fopen($fp_dst, 'c');
     /* Crypt file. */
     $r = fopen($fp_src, 'r');
     $w = fopen($fp_dst, 'c');


@@ -1008,8 +1223,8 @@ function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
     $crypt_key = $k;
     $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));
+    $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');
     /* Decrypt file. */
     $r = fopen($fp_src, 'r');
     $w = fopen($fp_dst, 'c');


@@ -1055,23 +1270,22 @@ function jirafeau_challenge_upload_password($cfg, $password)
 }
 
 /**
 }
 
 /**

- * Test if visitor's IP is authorized to upload.
- * @param $ip IP to be challenged
+ * 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.
  */
  * @return true if IP is authorized, false otherwise.
  */

-function jirafeau_challenge_upload_ip($cfg, $ip)
+function jirafeau_challenge_ip($allowedIpList, $challengedIp)

 {
 {

-    if (count($cfg['upload_ip']) == 0) {
-        return true;
-    }
-    foreach ($cfg['upload_ip'] as $i) {
-        if ($i == $ip) {
+    foreach ($allowedIpList as $i) {
+        if ($i == $challengedIp) {

             return true;
         }
         // CIDR test for IPv4 only.
         if (strpos($i, '/') !== false) {
             list($subnet, $mask) = explode('/', $i);
             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)) {
+            if ((ip2long($challengedIp) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) {

                 return true;
             }
         }
                 return true;
             }
         }


@@ -1079,43 +1293,54 @@ function jirafeau_challenge_upload_ip($cfg, $ip)
     return false;
 }
 
     return false;
 }
 

+/**
+ * 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;
+}
+
+/**
+ * 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;
+    }
+    return jirafeau_challenge_ip($cfg['upload_ip'], $challengedIp);
+}
+
+/**
+ * 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)
+{
+    return jirafeau_challenge_ip($cfg['upload_ip_nopassword'], $challengedIp);
+}
+

 /**
  * 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.
  */
 /**
  * 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)
+function jirafeau_challenge_upload($cfg, $ip, $password)

 {
 {

-    // Allow if no ip restrictaion and no password restriction
-    if ((count ($cfg['upload_ip']) == 0) and (count ($cfg['upload_password']) == 0)) {
-        return true;
-    }
-
-    // Allow if ip is in array
-    foreach ($cfg['upload_ip'] as $i) {
-        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;
-            }
-        }
-    }
-    if (!jirafeau_has_upload_password($cfg)) {
-        return false;
-    }
-    
-    foreach ($cfg['upload_password'] as $p) {
-        if ($password == $p) {
-            return true;
-        }
-    }
-    return false;
+    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 */
 }
 
 /** Tell if we have some HTTP headers generated by a proxy */


@@ -1197,210 +1422,143 @@ function hex_to_base64($hex)
 }
 
 /**
 }
 
 /**

- * Read alias informations
- * @return array containing informations.
+ * 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_get_alias($hash)
+function jirafeau_replace_markers($content, $htmllinebreaks = false)

 {
 {

-    $out = array();
-    $link = VAR_ALIAS . s2p("$hash") . $hash;
+    $patterns = array(
+        '/###ORGANISATION###/',
+        '/###CONTACTPERSON###/',
+        '/###WEBROOT###/'
+    );
+    $replacements = array(
+        $GLOBALS['cfg']['organisation'],
+        $GLOBALS['cfg']['contactperson'],
+        $GLOBALS['cfg']['web_root']
+    );
+    $content = preg_replace($patterns, $replacements, $content);

 
 

-    if (!file_exists($link)) {
-        return $out;
+    if (true === $htmllinebreaks) {
+        $content = nl2br($content);

     }
 
     }
 

-    $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);
-
-    return $out;
+    return $content;

 }
 
 }
 

-/** 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)
+function jirafeau_escape($string)

 {
 {

-    /* 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';
-    }
-
-    /* Check that alias does not already exists. */
-    $alias = md5($alias);
-    $p = VAR_ALIAS . s2p($alias);
-    if (file_exists($p)) {
-        return 'Error';
-    }
+    return htmlspecialchars($string, ENT_QUOTES);
+}

 
 

-    /* Create alias folder. */
-    @mkdir($p, 0755, true);
-    if (!file_exists($p)) {
-        return 'Error';
-    }
+function jirafeau_admin_session_start()
+{
+    $_SESSION['admin_auth'] = true;
+    $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true));
+}

 
 

-    /* Generate password. */
-    $md5_password = md5($password);
+function jirafeau_admin_session_end()
+{
+    $_SESSION = array();
+    session_destroy();
+}

 
 

-    /* Store informations. */
-    $p .= $alias;
-    $handle = fopen($p, 'w');
-    fwrite($handle,
-            $md5_password . NL .
-            $ip . NL .
-            time() . NL .
-            $destination . NL);
-    fclose($handle);
+function jirafeau_admin_session_logged()
+{
+    return isset($_SESSION['admin_auth']) &&
+           isset($_SESSION['admin_csrf']) &&
+           isset($_POST['admin_csrf']) &&
+           $_SESSION['admin_auth'] === true &&
+           $_SESSION['admin_csrf'] === $_POST['admin_csrf'];
+}

 
 

-    return 'Ok';
+function jirafeau_admin_csrf_field()
+{
+    return "<input type='hidden' name='admin_csrf' value='". $_SESSION['admin_csrf'] . "'/>";

 }
 
 }
 

-/** 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 jirafeau_alias_update($alias, $destination, $password,
-                       $new_password, $ip)
+function jirafeau_dir_size($dir)

 {
 {

-    $alias = md5($alias);
-    /* Check that alias exits. */
-    $a = jirafeau_get_alias($alias);
-    if (!count($a)) {
-        return 'Error';
+    $size = 0;
+    foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $entry) {
+        $size += is_file($entry) ? filesize($entry) : jirafeau_dir_size($entry);

     }
     }

+    return $size;
+}

 
 

-    /* Check that destination exists. */
-    $l = jirafeau_get_link($a["destination"]);
-    if (!count($l)) {
-        return 'Error';
-    }
+function jirafeau_export_cfg($cfg)
+{
+    $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) . ';';

 
 

-    /* Check password. */
-    if ($a["md5_password"] != md5($password)) {
-        return 'Error';
-    }
+    $fileWrite = file_put_contents(JIRAFEAU_CFG, $content);

 
 

-    $p = $a['md5_password'];
-    if (strlen($new_password) >= 8 &&
-        strlen($new_password) <= 32) {
-        $p = md5($new_password);
-    } elseif (strlen($new_password) > 0) {
-        return 'Error';
+    if (false === $fileWrite) {
+        jirafeau_fatal_error(t('Can not write local configuration file'));

     }
     }

-
-    /* Rewrite informations. */
-    $p = VAR_ALIAS . s2p($alias) . $alias;
-    $handle = fopen($p, 'w');
-    fwrite($handle,
-            $p . NL .
-            $ip . NL .
-            time() . NL .
-            $destination . NL);
-    fclose($handle);
-    return 'Ok';

 }
 
 }
 

-/** Get an alias.
- * @param $alias alias to get
- * @return alias destination or "Error" string
- */
-function jirafeau_alias_get($alias)
+function jirafeau_mkdir($path)

 {
 {

-    $alias = md5($alias);
-    /* Check that alias exits. */
-    $a = jirafeau_get_alias($alias);
-    if (!count($a)) {
-        return 'Error';
-    }
-
-    return $a['destination'];
+    return !(!file_exists($path) && !@mkdir($path, 0755));

 }
 
 }
 

-function jirafeau_clean_rm_alias($alias)
+/**
+ * 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_is_writable($path)

 {
 {

-    $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);
-    }
+    /* "@" gets rid of error messages. */
+    return is_writable($path) || @chmod($path, 0777);

 }
 
 }
 

-/** 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)
+function jirafeau_check_var_dir($path)

 {
 {

-    $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';
+    $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);
+        }

     }
 
     }
 

-    jirafeau_clean_rm_alias($alias);
-    return 'Ok';
+    return array('has_error' => false, 'why' => '');

 }
 
 }
 

-/**
- * 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)
+function jirafeau_add_ending_slash($path)

 {
 {

-    $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);
-    }
+    return $path . ((substr($path, -1) == '/') ? '' : '/');
+}

 
 

-    return $content;
+function jirafeau_default_web_root()
+{
+    return $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__), '', $_SERVER['REQUEST_URI']);

 }
 }