X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=18af33b97dc2d136af0e86564ce398ec2efe379f;hb=0e104a9282a1cdc7d769bbccb03bd3462aa8f4e0;hp=137257c89eb38d47fd03b58585a54af691c593e8;hpb=7618bd22d09e9bddab2ca39308f6523c06dd1521;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 137257c89e..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,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')))) {
@@ -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,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('
');
+ addToInstallContent('
');
foreach (getFatalArray() as $key => $err) {
- addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
+ addToInstallContent('
{--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
} // END - foreach
- addToInstallContent('
');
+ addToInstallContent('
');
} // END - if
+
$content['mysql_host'] = $GLOBALS['install_mysql']['host'];
$content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase'];
$content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
@@ -131,7 +139,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
$content['email'] = postRequestParameter('email');
// Use default SMTP data
- $smtpHost = '{?SMTP_HOSTNAME');
+ $smtpHost = '{?SMTP_HOSTNAME?}';
$smtpUser = '{?SMTP_USER?}';
$smtpPass1 = '{?SMTP_PASSWORD?}';
$smtpPass2 = '{?SMTP_PASSWORD?}';
@@ -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 .= ' ';
@@ -192,7 +200,14 @@ 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,8 +216,8 @@ 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!
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+ // Installation area not found
+ debug_report_bug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
return;
} // END - if
@@ -234,7 +249,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// Are some SQLs found?
if (countSqls() == 0) {
// Abort here
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
return;
} // END - if
@@ -267,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;
@@ -289,12 +307,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
default:
logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
- addTemplateToInstallContent('admin_settings_saved', '