add variable in conf to check if installation is done

[jirafeau.git] / install.php

diff --git a/install.php b/install.php
index e54d44f5791214148db93d6066e76d2b22fdef72..ca626aba3e915eec3703f1081fe9d1a957e8360b 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);
 
 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/lang.php');

-require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');

 
 function
 jirafeau_quoted ($str)
 
 function
 jirafeau_quoted ($str)


@@ -40,7 +41,7 @@ jirafeau_export_cfg ($cfg)
     fwrite ($handle,
             '/* ' .
             t ('This file was generated by the install process. ' .
     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)
     {
                '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));
             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);
         else
             fwrite ($handle, 'null');
         fwrite ($handle, ';'.NL);


@@ -95,7 +98,7 @@ jirafeau_check_var_dir ($path)
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
 
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
 

-    foreach (array ('files', 'links') as $subdir)
+    foreach (array ('files', 'links', 'async', 'block') as $subdir)

     {
         $subpath = $path.$subdir;
 
     {
         $subpath = $path.$subdir;
 


@@ -115,6 +118,12 @@ jirafeau_add_ending_slash ($path)
     return $path . ((substr ($path, -1) == '/') ? '' : '/');
 }
 
     return $path . ((substr ($path, -1) == '/') ? '' : '/');
 }
 

+if ($cfg['installation_done'] === true)
+{
+    header('Location: index.php');
+    exit;
+}
+

 if (!file_exists (JIRAFEAU_CFG))
 {
     /* We try to create an empty one. */
 if (!file_exists (JIRAFEAU_CFG))
 {
     /* We try to create an empty one. */


@@ -162,6 +171,7 @@ if (isset ($_POST['step']) && isset ($_POST['next']))
     case 3:
         $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
         $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
     case 3:
         $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
         $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);

+        $cfg['installation_done'] = true;

         jirafeau_export_cfg ($cfg);
         break;
 
         jirafeau_export_cfg ($cfg);
         break;
 


@@ -340,7 +350,7 @@ case 4:
         ?><form action = "<?php echo basename(__FILE__); ?>" method =
             "post"> <input type = "hidden" name = "jirafeau" value =
             "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
         ?><form action = "<?php echo basename(__FILE__); ?>" method =
             "post"> <input type = "hidden" name = "jirafeau" value =
             "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =

-            "step" value = "3" /><input type = "submit" name =
+            "step" value = "4" /><input type = "submit" name =

             "retry" value =
             "<?php echo t('Retry this step'); ?>" /></form>
             <?php echo '</p></div>';
             "retry" value =
             "<?php echo t('Retry this step'); ?>" /></form>
             <?php echo '</p></div>';