Renamed function so it might be more understandable

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 0b8928b27ce1bfc126c2da8a6c11284b2f161d04..9c0a5cf4840523956a4340bafa127139029c9df5 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -46,6 +44,15 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
+// Load extension timezone
+loadExtension('timezone', 'test');
+
+// Set config entry
+setConfigEntry('timezone', 'Europe/Berlin');
+
+// And init timezone
+FILTER_INIT_TIMEZONE();
+
 // Init variables
 $GLOBALS['install_mysql'] = array();
 if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
@@ -101,12 +108,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mxchange';
                        if (empty($GLOBALS['install_mysql']['type']))   $GLOBALS['install_mysql']['type']   = 'MyISAM';
                        if (ifFatalErrorsDetected()) {
-                               addToInstallContent('<div class="install_fatal">');
+                               addToInstallContent('<div class="install_fatal"><ul>');
                                foreach (getFatalArray() as $key => $err) {
-                                       addToInstallContent('<div class="para"><strong>&middot;</strong> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</div>');
+                                       addToInstallContent('<li> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</li>');
                                } // END - foreach
-                               addToInstallContent('</div>');
+                               addToInstallContent('</ol></div>');
                        } // END - if
+
                        $content['mysql_host']   = $GLOBALS['install_mysql']['host'];
                        $content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
                        $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
@@ -192,6 +200,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                // You have submitted data then we have to reset the SQLs
                                initSqls();
 
+                               // Restore PHPs error handler to prevent ours to handle errors,
+                               // e.g. failed connection attempts. We want to handle them on
+                               // our own.
+                               restore_error_handler();
+
                                // Connect to MySQL server
                                SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
 
@@ -267,6 +280,9 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);
+
+                                       // We have handled all fatal errors here
+                                       initFatalMessages();
                                } else {
                                        // Installation is done!
                                        redirectToUrl('install.php?page=finished');
@@ -289,7 +305,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                default:
                        logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
-                       addTemplateToInstallContent('admin_settings_saved', '<div class="install_error">{--WRONG_PAGE--}</div>');
+                       addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
                        break;
        } // END - switch
 } else {