X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/a6c1ba9e0d7305fc75eb216d1646d5a59d044986..d1ee60f610d6208a6acba1548bd18de774c7de79:/install.php?ds=sidebyside
diff --git a/install.php b/install.php
index ca626ab..41b25fc 100644
--- a/install.php
+++ b/install.php
@@ -52,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);
@@ -98,7 +101,7 @@ jirafeau_check_var_dir ($path)
$path . '
' . $solution_str .
'
' . $mkdir_str2);
- foreach (array ('files', 'links', 'async', 'block') as $subdir)
+ foreach (array ('files', 'links', 'async') as $subdir)
{
$subpath = $path.$subdir;
@@ -171,7 +174,6 @@ 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']);
- $cfg['installation_done'] = true;
jirafeau_export_cfg ($cfg);
break;
@@ -357,6 +359,9 @@ case 4:
}
else
{
+ $cfg['style'] = 'courgette';
+ $cfg['installation_done'] = true;
+ jirafeau_export_cfg ($cfg);
echo '