add variable in conf to check if installation is done

[jirafeau.git] / install.php

diff --git a/install.php b/install.php
index 87eaf60631c48092296ed03d4088e0e851078c7b..ca626aba3e915eec3703f1081fe9d1a957e8360b 100755 (executable)
--- a/install.php
+++ b/install.php
@@ -23,6 +23,7 @@ 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/config.original.php');
 
 require (JIRAFEAU_ROOT . 'lib/lang.php');
 require (JIRAFEAU_ROOT . 'lib/config.original.php');
 


@@ -117,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. */


@@ -134,11 +141,6 @@ if (!file_exists (JIRAFEAU_CFG))
         exit;
     }
 }
         exit;
     }
 }

-else
-{
-    header('Location: index.php');
-    exit;
-}

 
 if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
 {
 
 if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
 {


@@ -169,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;