fix installation bug

[jirafeau_mojo42.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
old mode 100755 (executable)
new mode 100644 (file)
index 278b11c..c613d4a
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -90,6 +90,18 @@ jirafeau_gen_random ($l)
     return $code;
 }
 
     return $code;
 }
 

+function is_ssl() {
+    if ( isset($_SERVER['HTTPS']) ) {
+        if ( 'on' == strtolower($_SERVER['HTTPS']) )
+            return true;
+        if ( '1' == $_SERVER['HTTPS'] )
+            return true;
+    } elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+        return true;
+    }
+    return false;
+}
+

 function
 jirafeau_human_size ($octets)
 {
 function
 jirafeau_human_size ($octets)
 {


@@ -317,8 +329,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 +434,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));

 }
 
 /**
 }
 
 /**


@@ -493,10 +503,10 @@ show_errors ()
     }
 }
 
     }
 }
 

-function check_errors ()
+function check_errors ($cfg)

 {
     if (file_exists (JIRAFEAU_ROOT . 'install.php')
 {
     if (file_exists (JIRAFEAU_ROOT . 'install.php')

-        && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))
+        && !($cfg['installation_done'] === true))

     {
         header('Location: install.php'); 
         exit;
     {
         header('Location: install.php'); 
         exit;


@@ -517,12 +527,6 @@ function check_errors ()
 
      if (!is_writable (VAR_BLOCK))
         add_error (t('The block directory is not writable!'), VAR_BLOCK);
 
      if (!is_writable (VAR_BLOCK))
         add_error (t('The block directory is not writable!'), VAR_BLOCK);

-
-   /* Check if the install.php script is still in the directory. */
-    if (file_exists (JIRAFEAU_ROOT . 'install.php'))
-        add_error (t('Installer script still present'),
-             t('Please make sure to delete the installer script ' .
-               '"install.php" before continuing.'));

 }
 
 /**
 }
 
 /**


@@ -892,8 +896,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 +911,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;
     }