Fix async uploads with encryption

[jirafeau_project.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 278b11cb1e27528671c0f530e87df9321a0c25ca..15c7a3e4f96a1c643e4c5a352fc0dee25f62891d 100755 (executable)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -317,8 +317,6 @@ jirafeau_delete_file ($md5)
 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)
 {

-    if (!is_int ($link_name_length))
-        $link_name_length = 8;

     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(


@@ -424,10 +422,10 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name
                  'link' =>'',
                  'delete_link' => ''));
     }
                  'link' =>'',
                  'delete_link' => ''));
     }

-    return (array ('error' => $noerr,
-                   'link' => $md5_link,
-                   'delete_link' => $delete_link_code,
-                   'crypt_key' => $crypt_key));
+   return (array ('error' => $noerr,
+                  'link' => $md5_link,
+                  'delete_link' => $delete_link_code,
+                  'crypt_key' => $crypt_key));

 }
 
 /**
 }
 
 /**


@@ -892,8 +890,6 @@ jirafeau_async_push ($ref, $data, $code)
 function
 jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
 {
 function
 jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
 {

-    if (!is_int ($link_name_length))
-        $link_name_length = 8;

     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);
     if (count ($a) == 0
     /* Get async infos. */
     $a = jirafeau_get_async_ref ($ref);
     if (count ($a) == 0


@@ -909,7 +905,7 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
     $crypt_key = '';
     if ($crypt == true && extension_loaded('mcrypt'))
     {
     $crypt_key = '';
     if ($crypt == true && extension_loaded('mcrypt'))
     {

-        $cypt_key = jirafeau_encrypt_file ($p, $p);
+        $crypt_key = jirafeau_encrypt_file ($p, $p);

         if (strlen($crypt_key) > 0)
             $crypted = true;
     }
         if (strlen($crypt_key) > 0)
             $crypted = true;
     }