X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=681e7c14aa5bf0f802276cad573ab586cb6f0aad;hp=0b8928b27ce1bfc126c2da8a6c11284b2f161d04;hb=18307767587d0bbb96c9e545790e590ebf3ea396;hpb=4cd3aebe807c719e7867ef5aefe824c55033f72d

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 0b8928b27c..681e7c14aa 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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(array());
+
 // Init variables
 $GLOBALS['install_mysql'] = array();
 if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
@@ -94,19 +101,20 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			addTemplateToInstallContent('install_page1');
 			break;
 
-		case '2': // MySQL data (alone!)
+		case '2': // Database login data
 			if (empty($GLOBALS['install_mysql']['dbase']))  $GLOBALS['install_mysql']['dbase']  = 'your_database';
 			if (empty($GLOBALS['install_mysql']['login']))  $GLOBALS['install_mysql']['login']  = 'your_login';
 			if (empty($GLOBALS['install_mysql']['host']))   $GLOBALS['install_mysql']['host']   = 'localhost';
-			if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mxchange';
+			if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer';
 			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'];
@@ -144,7 +152,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 				$smtpPass2 = postRequestParameter('smtp_pass');
 			} // END - if
 
-			// MySQL settings
+			// Database login data
 			$content['mysql_host']   = $GLOBALS['install_mysql']['host'];
 			$content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
 			$content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
@@ -176,7 +184,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$content['smtp_user'] = postRequestParameter('smtp_user');
 			$content['smtp_pass'] = postRequestParameter('smtp_pass1');
 
-			// MySQL data
+			// Database login data
 			$OUT = '';
 			foreach ($GLOBALS['install_mysql'] as $key => $value) {
 				$OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
@@ -192,7 +200,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 				// You have submitted data then we have to reset the SQLs
 				initSqls();
 
-				// Connect to MySQL server
+				// 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 database server
 				SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
 
 				// Is the link up?
@@ -201,7 +214,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 					if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
 						// Check for dumps
 						if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
-							// Installation area not found!
+							// Installation area not found
 							addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}');
 							return;
 						} // END - if
@@ -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 {