X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=18af33b97dc2d136af0e86564ce398ec2efe379f;hb=0e104a9282a1cdc7d769bbccb03bd3462aa8f4e0;hp=c45dc021bd2bcb9c67a6c271cd8389e319d8dc21;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index c45dc021bd..18af33b97d 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,11 +44,20 @@ 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
-$mysql = array();
+$GLOBALS['install_mysql'] = array();
if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
// Transfer 'mysql' array
- $mysql = postRequestParameter('mysql');
+ $GLOBALS['install_mysql'] = postRequestParameter('mysql');
} // END - if
// Check if both passwords from SMTP are matching
@@ -58,25 +65,25 @@ if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
// Okay, we have to check it
if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
// Hostname not set
- addToInstallContent('
' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_HOSTNAME_EMPTY--}
');
setGetRequestParameter('page', 3);
} // END - if
if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
// Password is empty
- addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_PASS1_EMPTY--}
');
setGetRequestParameter('page', 3);
} // END - if
if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
// Password repeat is empty
- addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_PASS2_EMPTY--}
');
setGetRequestParameter('page', 3);
} // END - if
if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
// Passwords are not matching
- addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_PASS_MISMATCH--}
');
setGetRequestParameter('page', 3);
} // END - if
} // END - if
@@ -94,24 +101,25 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
addTemplateToInstallContent('install_page1');
break;
- case '2': // MySQL data (alone!)
- if (empty($mysql['dbase'])) $mysql['dbase'] = 'your_database';
- if (empty($mysql['login'])) $mysql['login'] = 'your_login';
- if (empty($mysql['host'])) $mysql['host'] = 'localhost';
- if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
- if (empty($mysql['type'])) $mysql['type'] = 'MyISAM';
- if (getTotalFatalErrors() > 0) {
- addToInstallContent('
');
+ 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'] = 'mailer';
+ if (empty($GLOBALS['install_mysql']['type'])) $GLOBALS['install_mysql']['type'] = 'MyISAM';
+ if (ifFatalErrorsDetected()) {
+ addToInstallContent('
');
foreach (getFatalArray() as $key => $err) {
- addToInstallContent('
');
// Are some SQLs found?
- if (countSqls() == '0') {
+ if (countSqls() == 0) {
// Abort here
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
return;
} // END - if
@@ -243,14 +262,14 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
} // END - if
} // END - if
- if (getTotalFatalErrors() > 0) {
+ if (ifFatalErrorsDetected()) {
$OUT = '';
foreach (getFatalArray() as $value) {
$OUT .= '
' . $value . '
';
} // END foreach
$content['fatal_errors'] = $OUT;
$OUT = '';
- foreach ($mysql as $key => $value) {
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
$OUT .= ' ';
} // END foreach
$content['mysql_hidden'] = $OUT;
@@ -263,13 +282,16 @@ 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');
}
} else {
// Something goes wrong during installation! :-(
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
}
break;
@@ -285,12 +307,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
default:
logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
- addTemplateToInstallContent('admin_settings_saved', '