X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=28db1db9a3087b9639cc8186125a1ca15c562fd0;hb=2dac220ef1018726eab4d8e20bb0682b609f067e;hp=09f399cece65b73b5ecdc33b1b8110fdd38780a9;hpb=bc72f913ef9ef26f4103d3deddb4d8be5337a1e5;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 09f399cece..28db1db9a3 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -14,11 +14,10 @@
* $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 *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -36,54 +35,59 @@
* MA 02110-1301 USA *
************************************************************************/
-/************************************************************************
- * YOU MAY ALSO WANT TO REMOVE THIS FILE AFTER INSTALLTION! *
- ************************************************************************/
-
// Some security stuff...
-if (!defined('__SECURITY')) {
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
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();
-if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
+$GLOBALS['install_mysql'] = array();
+if ((isPostRequestElementSet('mysql')) && (ifPostContainsSelections('mysql'))) {
// Transfer 'mysql' array
- $mysql = postRequestElement('mysql');
+ $GLOBALS['install_mysql'] = postRequestElement('mysql');
} // END - if
// Check if both passwords from SMTP are matching
-if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
+if ((isGetRequestElementSet('install_page') && (getRequestElement('install_page') == 5))) {
// Okay, we have to check it
if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
// Hostname not set
- addToInstallContent('
');
+ setGetRequestElement('install_page', 3);
} // END - if
if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
// Password is empty
- addToInstallContent('
');
+ setGetRequestElement('install_page', 3);
} // END - if
if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
// Passwords are not matching
- addToInstallContent('
');
+ setGetRequestElement('install_page', 3);
} // END - if
} // END - if
// Is the mailer installed or no admin registered so far?
if ((!isInstalled()) || (!isAdminRegistered())) {
// Output page for entered value
- switch (getRequestElement('page')) {
+ switch (getRequestElement('install_page')) {
case 'welcome': // Welcome to the installation!
addTemplateToInstallContent('install_welcome');
break;
@@ -93,24 +97,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__, '{--INSTALLER_SQL_IMPORT_FAILED--}');
return;
} // END - if
- // Now run all queries through and try to keep out empty or comment queries
+ // Now run all queries through
runFilterChain('run_sqls');
// Copy the config template and verify it
- doInstallWriteLocalConfig();
+ doInstallWriteLocalConfigurationFile(postRequestElement('spath'));
} // END - if
} // END - if
} // END - if
- if (getTotalFatalErrors() > 0) {
+ // Are some fatal errors there?
+ 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;
@@ -262,13 +280,22 @@ 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');
+ // Register ext-sql_patches
+ if ((registerExtension('sql_patches', NULL)) && (registerExtension('task', NULL))) {
+ // Installation is done!
+ redirectToUrl('install.php?install_page=finished');
+ } else {
+ // Something goes wrong on registration of ext-sql_patches
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_FINALIZER_CANNOT_REGISTER_SQL_PATCHES--}');
+ }
}
} else {
// Something goes wrong during installation! :-(
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_FINALIZER_FAILED--}');
}
break;
@@ -283,13 +310,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
break;
default:
- logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
- addTemplateToInstallContent('admin_settings_saved', '