[BUGFIX] run session_start before outputing any html

[jirafeau.git] / install.php

diff --git a/install.php b/install.php
index 9e05b8c449658776eefc501608a029927ff5e742..8c0f686745fccf108b56f1dab831fcb9195f46dc 100644 (file)
--- a/install.php
+++ b/install.php
@@ -83,7 +83,7 @@ function jirafeau_check_var_dir($path)
                                '<br />' . $mkdir_str2);
     }
 
                                '<br />' . $mkdir_str2);
     }
 

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

         $subpath = $path.$subdir;
 
         if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
         $subpath = $path.$subdir;
 
         if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {


@@ -102,13 +102,6 @@ function jirafeau_add_ending_slash($path)
     return $path . ((substr($path, -1) == '/') ? '' : '/');
 }
 
     return $path . ((substr($path, -1) == '/') ? '' : '/');
 }
 

-function jirafeau_fatal_error($errorText)
-{
-    echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
-    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-    exit;
-}
-

 /**
  * Check installation
  **/
 /**
  * Check installation
  **/


@@ -161,7 +154,11 @@ if (isset($_POST['step']) && isset($_POST['next'])) {
         break;
 
     case 2:
         break;
 
     case 2:

-        $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
+        if (strlen($_POST['admin_password'])) {
+            $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
+        } else {
+            $cfg['admin_password'] = '';
+        }

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


@@ -338,7 +335,7 @@ case 4:
         jirafeau_export_cfg($cfg);
         echo '<div class="message"><p>' .
              t('Jirafeau is now fully operational') . ':' .
         jirafeau_export_cfg($cfg);
         echo '<div class="message"><p>' .
              t('Jirafeau is now fully operational') . ':' .

-             '<br /><a href="' . $cfg['web_root'] . '">' .
+             '<br /><a href="./">' .

              $cfg['web_root'].'</a></p></div>';
     }
 break;
              $cfg['web_root'].'</a></p></div>';
     }
 break;