Translated using Weblate (Finnish)

[jirafeau_mojo42.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
old mode 100755 (executable)
new mode 100644 (file)
index 223fd8e..27e4fc3
--- 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) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>

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


@@ -60,8 +60,8 @@ base_16_to_64 ($num)
     $i = 0;
     # Convert long hex string to bin.
     $size = strlen ($num);
     $i = 0;
     # Convert long hex string to bin.
     $size = strlen ($num);

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

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


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

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

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


@@ -122,10 +137,11 @@ function
 jirafeau_clean_rm_file ($md5)
 {
     $p = s2p ("$md5");
 jirafeau_clean_rm_file ($md5)
 {
     $p = s2p ("$md5");

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

     $parse = VAR_FILES . $p;
     $scan = array();
     while (file_exists ($parse)
     $parse = VAR_FILES . $p;
     $scan = array();
     while (file_exists ($parse)


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

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

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

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

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


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

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

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


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

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

 
 

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

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

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

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

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

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

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

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


@@ -411,11 +441,12 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip)
     }
    return (array ('error' => $noerr,
                   'link' => $md5_link,
     }
    return (array ('error' => $noerr,
                   'link' => $md5_link,

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

 }
 
 /**
 }
 
 /**

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

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


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

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

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


@@ -477,10 +508,10 @@ show_errors ()
     }
 }
 
     }
 }
 

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

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

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

     {
         header('Location: install.php'); 
         exit;
     {
         header('Location: install.php'); 
         exit;


@@ -498,15 +529,6 @@ function check_errors ()
     
     if (!is_writable (VAR_ASYNC))
         add_error (t('The async directory is not writable!'), VAR_ASYNC);
     
     if (!is_writable (VAR_ASYNC))
         add_error (t('The async directory is not writable!'), VAR_ASYNC);

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

 }
 
 /**
 }
 
 /**


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

+    if (trim ($c[10]) == 'C')
+           $out['crypted'] = true;
+    else
+           $out['crypted'] = false;

     
     return $out;
 }
     
     return $out;
 }


@@ -818,10 +844,11 @@ 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

+  * @param $max_file_size maximum allowed file size

   * @return  a string containing a next code to use or the string "Error"
   */
 function
   * @return  a string containing a next code to use or the string "Error"
   */
 function

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

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


@@ -835,9 +862,21 @@ jirafeau_async_push ($ref, $data, $code)
     
     $p = s2p ($ref);
 
     
     $p = s2p ($ref);
 

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

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

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

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


@@ -850,7 +889,7 @@ jirafeau_async_push ($ref, $data, $code)
     }
     fclose ($r);
     fclose ($w);
     }
     fclose ($r);
     fclose ($w);

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

     
     /* Update async file. */
     $code = jirafeau_gen_random (4);
     
     /* Update async file. */
     $code = jirafeau_gen_random (4);


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

+  * @param $crypt boolean asking to crypt or not
+  * @param $link_name_length link name length

   * @return  a string containing the download reference followed by a delete code or the string "Error"
   */
 function
   * @return  a string containing the download reference followed by a delete code or the string "Error"
   */
 function

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

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


@@ -882,10 +923,20 @@ jirafeau_async_end ($ref, $code)
     $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 = '';
+    if ($crypt == true && extension_loaded('mcrypt') == true)
+    {
+        $crypt_key = jirafeau_encrypt_file ($p, $p);
+        if (strlen($crypt_key) > 0)
+            $crypted = true;
+    }
+

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

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

     
     /* File already exist ? */ 
     if (!file_exists (VAR_FILES . $np))
     
     /* File already exist ? */ 
     if (!file_exists (VAR_FILES . $np))


@@ -906,14 +957,14 @@ jirafeau_async_end ($ref, $code)
     fclose ($handle);
     
     /* Create link. */
     fclose ($handle);
     
     /* Create link. */

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

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

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

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

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

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


@@ -921,311 +972,139 @@ jirafeau_async_end ($ref, $code)
     
     /* Clean async upload. */
     jirafeau_async_delete ($ref);
     
     /* Clean async upload. */
     jirafeau_async_delete ($ref);

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

 }
 
 }
 

-/**
-  * Delete a block.
-  * @param $id identifier of the block.
-  */

 function
 function

-jirafeau_block_delete_ ($id)
+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"
-  */
+ * Crypt file and returns decrypt key.
+ * @param $fp_src file path to the file to crypt.
+ * @param $fp_dst file path to the file to write crypted file (could be the same).
+ * @return decrypt key composed of the key and the iv separated by a point ('.')
+ */

 function
 function

-jirafeau_block_init ($size)
+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;
-    }
-
-    /* Create block. */
-    $p .= $id;
-    $h = fopen ($p, 'w');
-    $fill = str_repeat ("\0", 1024);
-    for ($cnt = 0; $cnt < $size; $cnt += 1024)
-    {
-       if ($size - $cnt < 1024)
-            $fill = str_repeat ("\0", $size - $cnt);
-        if (fwrite ($h, $fill) === false)
-        {
-            fclose ($h);
-            jirafeau_block_delete_ ($id);
-            return "Error";
-        }
-    }
-    fclose ($h);
-
-    /* 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)
+    $fs = filesize ($fp_src);
+    if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true))
+        return '';
+
+    /* Prepare module. */
+    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
+    /* Generate key. */
+    $crypt_key = jirafeau_gen_random (10);
+    $md5_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+    /* Init module. */
+    mcrypt_generic_init($m, $md5_key, $iv);
+    /* Crypt file. */
+    $r = fopen ($fp_src, 'r');
+    $w = fopen ($fp_dst, 'c');
+    while (!feof ($r))

     {
     {

-        jirafeau_block_delete_ ($id);
-        return "Error";
+        $enc = mcrypt_generic($m, fread ($r, 1024));
+        if (fwrite ($w, $enc) === false)
+            return '';

     }
     }

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

 }
 
 /**
 }
 
 /**

-  * 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
-  */
+ * Decrypt file.
+ * @param $fp_src file path to the file to decrypt.
+ * @param $fp_dst file path to the file to write decrypted file (could be the same).
+ * @param $k string composed of the key and the iv separated by a point ('.')
+ * @return key used to decrypt. a string of length 0 is returned if failed.
+ */

 function
 function

-jirafeau_block_read ($id, $start, $length)
+jirafeau_decrypt_file ($fp_src, $fp_dst, $k)

 {
 {

-    if (!ctype_digit ($start) || $start < 0
-        || !ctype_digit ($length) || $length <= 0)
-    {
-        echo "Error";
-        return;
-    }
-
-    $p = VAR_BLOCK . s2p ($id) . $id;
-    if (!file_exists ($p))
-    {
-        echo "Error";
-        return;
-    }
-
-    /* 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;
-        }
-    }
-    /* Remove data. */
-    elseif (date ('U') - $date >= JIRAFEAU_MONTH)
-    {
-        echo date ('U'). " $date ";
-        jirafeau_block_delete_ ($id);
-        echo "Error";
-        return;
-    }
-
-    if ($start + $length > $block_size)
-    {
-        echo "Error";
-        return;
-    }
-
-    /* Read content. */
-    header ('Content-Length: ' . $length);
-    header ('Content-Disposition: attachment');
-
-    $r = fopen ($p, 'r');
-    if (fseek ($r, $start) != 0)
-    {
-        echo "Error";
-        return;
-    }
-    $c = 1024;
-    for ($cnt = 0; $cnt < $length && !feof ($r); $cnt += 1024)
+    $fs = filesize ($fp_src);
+    if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true))
+        return false;
+
+    /* Init module */
+    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
+    /* Extract key and iv. */
+    $crypt_key = $k;
+    $md5_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+    /* Decrypt file. */
+    $r = fopen ($fp_src, 'r');
+    $w = fopen ($fp_dst, 'c');
+    while (!feof ($r))

     {
     {

-        if ($length - $cnt < 1024)
-            $c = $length - $cnt;
-        print fread ($r, $c);
-        ob_flush();
+        $dec = mdecrypt_generic($m, fread ($r, 1024));
+        if (fwrite ($w, $dec) === false)
+            return false;

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

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

 }
 
 /**
 }
 
 /**

-  * 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)
+ * 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
-        || strlen ($code) == 0)
-        return "Error";
-
-    $p = VAR_BLOCK . s2p ($id) . $id;
-    if (!file_exists ($p))
-        return "Error";
-
-    /* Check date. */
-    $f = file ($p . '_infos');
-    $date = trim ($f[0]);
-    $block_size = trim ($f[1]);
-    $stored_code = trim ($f[2]);
-    /* Update date. */
-    if (date ('U') - $date > JIRAFEAU_HOUR
-        && date ('U') - $date < JIRAFEAU_MONTH)
-    {
-        if (file_put_contents ($p . '_infos', date ('U') . NL . $block_size . NL . $stored_code) === FALSE)
-        {
-            jirafeau_block_delete_ ($id);
-            return "Error";
-        }
-    }
-    /* Remove data. */
-    elseif (date ('U') - $date >= JIRAFEAU_MONTH)
-    {
-        jirafeau_block_delete_ ($id);
-        return "Error";
-    }
-
-    /* Check code. */
-    if ($stored_code != $code)
-    {
-        echo "Error";
-        return;
-    }
-
-    /* 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";
-
-    /* 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";
+    return count ($cfg['upload_password']) > 0;

 }
 
 /**
 }
 
 /**

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

 {
 {

-    $p = VAR_BLOCK . s2p ($id) . $id;
-
-    if (!file_exists ($p))
-        return "Error";
-
-    $f = file ($p . '_infos');
-    $date = trim ($f[0]);
-    $block_size = trim ($f[1]);
-    $stored_code = trim ($f[2]);
-
-    if ($code != $stored_code)
-        return "Error";
-
-    jirafeau_block_delete_ ($id);
-    return "Ok";
+    if (!jirafeau_has_upload_password($cfg))
+        return false;
+    forEach ($cfg['upload_password'] as $p)
+        if ($password == $p)
+            return true;
+    return false;

 }
 
 /**
 }
 
 /**

- * Clean old unused blocks.
- * @return number of cleaned blocks.
+ * Test if visitor's IP is authorized to upload.
+ * @param $ip IP to be challenged
+ * @return true if IP is authorized, false otherwise.

  */
  */

-function
-jirafeau_admin_clean_block ()
+function jirafeau_challenge_upload_ip ($cfg, $ip)

 {
 {

-    $count = 0;
-    /* Get all blocks. */
-    $stack = array (VAR_BLOCK);
-    while (($d = array_shift ($stack)) && $d != NULL)
+    if (count ($cfg['upload_ip']) == 0)
+        return true;
+    forEach ($cfg['upload_ip'] as $i)

     {
     {

-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
+        if ($i == $ip)
+            return true;
+        // CIDR test for IPv4 only.
+        if (strpos ($i, '/') !== false)

         {
         {

-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0)
-                continue;
-
-            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++;
-                }
-            }
+            list ($subnet, $mask) = explode('/', $i);
+            if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet))
+                return true;

         }
     }
         }
     }

-    return $count;
+    return false;

 }
 
 }
 

-
-?>