X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/3d9792a36b5bb18d24216eea4b0ad402358db997..d1ee60f610d6208a6acba1548bd18de774c7de79:/install.php?ds=inline diff --git a/install.php b/install.php old mode 100755 new mode 100644 index d8e5fdf..41b25fc --- 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); +require (JIRAFEAU_ROOT . 'lib/functions.php'); require (JIRAFEAU_ROOT . 'lib/lang.php'); require (JIRAFEAU_ROOT . 'lib/config.original.php'); @@ -51,6 +52,9 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, jirafeau_quoted ($item)); else if (is_int ($item)) fwrite ($handle, $item); + else if (is_array ($item)) + fwrite ($handle, str_replace(array("\n", "\r"), "", + var_export ($item, true))); else fwrite ($handle, 'null'); fwrite ($handle, ';'.NL); @@ -97,7 +101,7 @@ jirafeau_check_var_dir ($path) $path . '</code><br />' . $solution_str . '<br />' . $mkdir_str2); - foreach (array ('files', 'links', 'async', 'block') as $subdir) + foreach (array ('files', 'links', 'async') as $subdir) { $subpath = $path.$subdir; @@ -117,6 +121,12 @@ jirafeau_add_ending_slash ($path) 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. */ @@ -349,6 +359,9 @@ case 4: } else { + $cfg['style'] = 'courgette'; + $cfg['installation_done'] = true; + jirafeau_export_cfg ($cfg); echo '<div class="message"><p>' . t('Jirafeau is now fully operational') . ':' . '<br /><a href="' . $cfg['web_root'] . '">' .