X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=062ed05871e79b64836b515c34f1a1fd5100f878;hb=34297125f617f854d2cc009d3cc4f16b6581a1f5;hp=25150d184e5f416d5268c69772afbbfbca5e238c;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 25150d184e..062ed05871 100644
--- 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,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();
+
// 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';
+ 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']['type'])) $GLOBALS['install_mysql']['type'] = 'MyISAM';
if (ifFatalErrorsDetected()) {
- addToInstallContent('
');
+ addToInstallContent('
');
foreach (getFatalArray() as $key => $err) {
- addToInstallContent('