[BUGFIX] fix error return

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 4e227967475973466a0c186fcbf616aeeaecf559..5f430665e96cbcc5b66e823acd4ffe7c2c81e328 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


@@ -321,7 +321,7 @@ function jirafeau_delete_file($hash)
 
 
 /** hash file's content
 
 
 /** hash file's content

- * @param $method hash method, see 'file_hash' option. 'md5' or 'md5_outside'.
+ * @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
  */
  * @param $file_path file to hash
  * @returns hash string
  */


@@ -332,6 +332,8 @@ function jirafeau_hash_file($method, $file_path)
             return jirafeau_md5_outside($file_path);
         case 'md5':
             return md5_file($file_path);
             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);
 }
     }
     return md5_file($file_path);
 }


@@ -343,22 +345,30 @@ function jirafeau_hash_file($method, $file_path)
  */
 function jirafeau_md5_outside($file_path)
 {
  */
 function jirafeau_md5_outside($file_path)
 {

-    $size = filesize($file_path);
-    if ($size === false) {
-        $size = 0;
-    }
+    $out = false;

     $handle = fopen($file_path, "r");
     if ($handle === false) {
         return 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) {
     $first = fread($handle, 64);
     if ($first === false) {

-        return false;
+        goto err;
+    }
+    if (fseek($handle, $size < 64 ? 0 : $size - 64) == -1) {
+        goto err;

     }
     }

-    fseek($handle, $size < 64 ? 0 : $size - 64);

     $last = fread($handle, 64);
     $last = fread($handle, 64);

+    if ($last === false) {
+        goto err;
+    }
+    $out = md5($first . $last . $size);
+    err:

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

-    return md5($first . $last . $size);
+    return $out;

 }
 
 /**
 }
 
 /**


@@ -559,6 +569,14 @@ function check_errors($cfg)
     if (!is_writable(VAR_ASYNC)) {
         add_error(t('ASYNC_DIR_W'), VAR_ASYNC);
     }
     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');
+    }

 }
 
 /**
 }
 
 /**


@@ -995,7 +1013,7 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
     $l = s2p("$hash_link");
     if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
         !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
     $l = s2p("$hash_link");
     if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
         !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {

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

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


@@ -1326,3 +1344,12 @@ function jirafeau_admin_csrf_field()
 {
     return "<input type='hidden' name='admin_csrf' value='". $_SESSION['admin_csrf'] . "'/>";
 }
 {
     return "<input type='hidden' name='admin_csrf' value='". $_SESSION['admin_csrf'] . "'/>";
 }

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