quick dirty patch to fix installation

[jirafeau_project.git] / install.php

diff --git a/install.php b/install.php
index c753c5bdd1e4dd9f4ff2f8b0ccf07f3500b6fa74..8cae45c6f7d5034cacc92b124ad365cf0de6bba9 100755 (executable)
--- a/install.php
+++ b/install.php
@@ -23,8 +23,9 @@ define ('QUOTE', "'");
 define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php');
 define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
+require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
 
 function
 jirafeau_quoted ($str)
@@ -40,7 +41,7 @@ jirafeau_export_cfg ($cfg)
     fwrite ($handle,
             '/* ' .
             t ('This file was generated by the install process. ' .
-               'You can edit it. Please see config.php to understand the ' .
+               'You can edit it. Please see config.original.php to understand the ' .
                'configuration items.') . ' */' . NL);
     foreach ($cfg as $key => $item)
     {
@@ -49,6 +50,8 @@ jirafeau_export_cfg ($cfg)
             fwrite ($handle, ($item ? 'true' : 'false'));
         else if (is_string ($item))
             fwrite ($handle, jirafeau_quoted ($item));
+        else if (is_int ($item))
+            fwrite ($handle, $item);
         else
             fwrite ($handle, 'null');
         fwrite ($handle, ';'.NL);
@@ -95,7 +98,7 @@ jirafeau_check_var_dir ($path)
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
 
-    foreach (array ('files', 'links', 'async') as $subdir)
+    foreach (array ('files', 'links', 'async', 'block') as $subdir)
     {
         $subpath = $path.$subdir;
 
@@ -132,6 +135,11 @@ if (!file_exists (JIRAFEAU_CFG))
         exit;
     }
 }
+#else
+#{
+#    header('Location: index.php');
+#    exit;
+#}
 
 if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
 {