media/courgette: fix borders in install

[jirafeau_mojo42.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 3a304a427128031b05ca10d6f9cfe4d3e8d4d2a4..25464977b6eed6d2e8a2b4d3b68bafb8bb638fac 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -443,7 +443,7 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name
 }
 
 /**
 }
 
 /**

- * 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
  */


@@ -841,10 +841,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);


@@ -858,9 +859,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)


@@ -873,7 +886,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);


@@ -891,7 +904,7 @@ jirafeau_async_push ($ref, $data, $code)
   * @param $ref asynchronous upload reference
   * @param $code client code for this operation
   * @param $crypt boolean asking to crypt or not
   * @param $ref asynchronous upload reference
   * @param $code client code for this operation
   * @param $crypt boolean asking to crypt or not

-  * @param $link_name_length link name lenght
+  * @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