X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/d8192d6d361c2d707bac679facce23c7167cb93b..6649209beb2b299d5f740d3b748634d66f05cd8a:/install.php?ds=sidebyside

diff --git a/install.php b/install.php
old mode 100755
new mode 100644
index ca626ab..41b25fc
--- 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 . '</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;
 
@@ -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 '<div class="message"><p>' .
              t('Jirafeau is now fully operational') . ':' .
              '<br /><a href="' . $cfg['web_root'] . '">' .