Fix config parameter and rename config.php

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index a8851aac6fb1c60c209fe3e981d8668851d87108..278b11cb1e27528671c0f530e87df9321a0c25ca 100755 (executable)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -122,10 +122,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)


@@ -316,6 +317,8 @@ 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(


@@ -388,7 +391,7 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name
         $password = md5 ($key);
 
     /* create link file */
         $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 .
     $handle = fopen ($link_tmp_name, 'w');
     fwrite ($handle,
             $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .


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

 }
 
 /**
 }
 
 /**


@@ -889,6 +892,8 @@ 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


@@ -933,7 +938,7 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
     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 .
     $handle = fopen ($link_tmp_name, 'w');
     fwrite ($handle,
             $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .