Fix some bugs due to PHP's max_execution_time

[jirafeau_project.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index b658b17d19b9727b80217058f6a18360e3808564..87d2cff173a9e0542c7b718d520c7eb8b0845a1a 100755 (executable)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -329,7 +329,7 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip)
 
     /* file informations */
     $md5 = md5_file ($file['tmp_name']);
-    $name = trim ($file['name']);
+    $name = str_replace (NL, '', trim ($file['name']));
     $mime_type = $file['type'];
     $size = $file['size'];
 
@@ -801,9 +801,10 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
     $p .= $ref;
     $handle = fopen ($p, 'w');
     fwrite ($handle,
-            $filename . NL. $type . NL. $password . NL. $time . NL .
-            ($one_time ? 'O' : 'R') . NL . $ip . NL . date ('U') . NL .
-            $code . NL);
+            str_replace (NL, '', trim ($filename)) . NL .
+            str_replace (NL, '', trim ($type)) . NL . $password . NL .
+            $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .
+            date ('U') . NL . $code . NL);
     fclose ($handle);
 
     return $ref . NL . $code ;