X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=28db1db9a3087b9639cc8186125a1ca15c562fd0;hb=2dac220ef1018726eab4d8e20bb0682b609f067e;hp=d0e49a6f41ba06f2f45695109a9fa9b77ae86d94;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/install-inc.php b/inc/install-inc.php
index d0e49a6f41..28db1db9a3 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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 *
@@ -35,12 +35,8 @@
  * 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
 
@@ -51,47 +47,47 @@ loadExtension('timezone', 'test');
 setConfigEntry('timezone', 'Europe/Berlin');
 
 // And init timezone
-FILTER_INIT_TIMEZONE();
+FILTER_INIT_TIMEZONE(array());
 
 // Init variables
 $GLOBALS['install_mysql'] = array();
-if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
+if ((isPostRequestElementSet('mysql')) && (ifPostContainsSelections('mysql'))) {
 	// Transfer 'mysql' array
-	$GLOBALS['install_mysql'] = postRequestParameter('mysql');
+	$GLOBALS['install_mysql'] = postRequestElement('mysql');
 } // END - if
 
 // Check if both passwords from SMTP are matching
-if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
+if ((isGetRequestElementSet('install_page') && (getRequestElement('install_page') == 5))) {
 	// Okay, we have to check it
-	if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
+	if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
 		// Hostname not set
-		addToInstallContent('<div class="para">{--INSTALL_SMTP_HOSTNAME_EMPTY--}</div>');
-		setGetRequestParameter('page', 3);
+		addToInstallContent('<div class="para">{--INSTALLER_SMTP_HOSTNAME_EMPTY--}</div>');
+		setGetRequestElement('install_page', 3);
 	} // END - if
 
-	if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
+	if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
 		// Password is empty
-		addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS1_EMPTY--}</div>');
-		setGetRequestParameter('page', 3);
+		addToInstallContent('<div class="para">{--INSTALLER_SMTP_PASSWORD1_EMPTY--}</div>');
+		setGetRequestElement('install_page', 3);
 	} // END - if
 
-	if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
+	if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
 		// Password repeat is empty
-		addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS2_EMPTY--}</div>');
-		setGetRequestParameter('page', 3);
+		addToInstallContent('<div class="para">{--INSTALLER_SMTP_PASSWORD2_EMPTY--}</div>');
+		setGetRequestElement('install_page', 3);
 	} // END - if
 
-	if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
+	if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
 		// Passwords are not matching
-		addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS_MISMATCH--}</div>');
-		setGetRequestParameter('page', 3);
+		addToInstallContent('<div class="para">{--INSTALLER_SMTP_PASS_MISMATCH--}</div>');
+		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 (getRequestParameter('page')) {
+	switch (getRequestElement('install_page')) {
 		case 'welcome': // Welcome to the installation!
 			addTemplateToInstallContent('install_welcome');
 			break;
@@ -105,7 +101,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			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"><ul>');
@@ -120,11 +116,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
 			$content['mysql_login']  = $GLOBALS['install_mysql']['login'];
 			$content['table_type']   = $GLOBALS['install_mysql']['type'];
-			$content['spath']        = postRequestParameter('spath');
-			$content['burl']         = postRequestParameter('burl');
-			$content['title']        = postRequestParameter('title');
-			$content['slogan']       = postRequestParameter('slogan');
-			$content['email']        = postRequestParameter('email');
+			$content['spath']        = postRequestElement('spath');
+			$content['burl']         = postRequestElement('burl');
+			$content['title']        = postRequestElement('title');
+			$content['slogan']       = postRequestElement('slogan');
+			$content['email']        = postRequestElement('email');
 
 			// Load template
 			addTemplateToInstallContent('install_page2', $content);
@@ -132,11 +128,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
 		case '3':
 			// Set more values
-			$content['spath']      = postRequestParameter('spath');
-			$content['burl']       = postRequestParameter('burl');
-			$content['title']      = postRequestParameter('title');
-			$content['slogan']     = postRequestParameter('slogan');
-			$content['email']      = postRequestParameter('email');
+			$content['spath']      = postRequestElement('spath');
+			$content['burl']       = postRequestElement('burl');
+			$content['title']      = postRequestElement('title');
+			$content['slogan']     = postRequestElement('slogan');
+			$content['email']      = postRequestElement('email');
 
 			// Use default SMTP data
 			$smtpHost  = '{?SMTP_HOSTNAME?}';
@@ -145,11 +141,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$smtpPass2 = '{?SMTP_PASSWORD?}';
 
 			// Overwrite it with the data from sent (failed) form
-			if (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host');
-			if (isPostRequestParameterSet('smtp_user')) $smtpUser = postRequestParameter('smtp_user');
-			if (isPostRequestParameterSet('smtp_pass')) {
-				$smtpPass1 = postRequestParameter('smtp_pass');
-				$smtpPass2 = postRequestParameter('smtp_pass');
+			if (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host');
+			if (isPostRequestElementSet('smtp_user')) $smtpUser = postRequestElement('smtp_user');
+			if (isPostRequestElementSet('smtp_pass')) {
+				$smtpPass1 = postRequestElement('smtp_pass');
+				$smtpPass2 = postRequestElement('smtp_pass');
 			} // END - if
 
 			// Database login data
@@ -173,16 +169,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
 		case '5': // Misc settings
 			// General settings
-			$content['spath']  = postRequestParameter('spath');
-			$content['burl']   = postRequestParameter('burl');
-			$content['title']  = postRequestParameter('title');
-			$content['slogan'] = postRequestParameter('slogan');
-			$content['email']  = postRequestParameter('email');
+			$content['spath']  = postRequestElement('spath');
+			$content['burl']   = postRequestElement('burl');
+			$content['title']  = postRequestElement('title');
+			$content['slogan'] = postRequestElement('slogan');
+			$content['email']  = postRequestElement('email');
 
 			// SMTP settings
-			$content['smtp_host'] = postRequestParameter('smtp_host');
-			$content['smtp_user'] = postRequestParameter('smtp_user');
-			$content['smtp_pass'] = postRequestParameter('smtp_pass1');
+			$content['smtp_host'] = postRequestElement('smtp_host');
+			$content['smtp_user'] = postRequestElement('smtp_user');
+			$content['smtp_pass'] = postRequestElement('smtp_pass1');
 
 			// Database login data
 			$OUT = '';
@@ -196,13 +192,15 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			break;
 
 		case 'finalize': // Write captured data to files
-			if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
+			if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 				// You have submitted data then we have to reset the SQLs
 				initSqls();
 
-				// Restore PHPs error handler to prevent ours to handle errors,
-				// e.g. failed connection attempts. We want to handle them on
-				// our own.
+				/*
+				 * 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
@@ -213,22 +211,23 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 					// Seems to work, also right database?
 					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__, '{--INSTALL_MISSING_DUMPS--}');
+						if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+							// Installation area not found
+							reportBug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
 							return;
 						} // END - if
 
 						// Any errors detected?
 						if (!ifFatalErrorsDetected()) {
-							// Set type and prefix from POST data
-							setConfigEntry('_TABLE_TYPE'  , postRequestParameter('mysql', 'type'));
-							setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
+							// Set type, prefix from POST data and database name for later queries
+							setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
+							setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
+							setConfigEntry('__DB_NAME'    , $GLOBALS['install_mysql']['dbase']);
 
 							// Both exists so import them
 							foreach (array('tables', 'menu-'.getLanguage()) as $dump) {
 								// Should be save here because file_exists() is there but we check it again. :)
-								$FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql';
+								$FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
 
 								// Is the file readable?
 								if (isFileReadable($FQFN)) {
@@ -239,7 +238,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 									mergeSqls(explode(";\n", $fileContent), 'install');
 								} else {
 									// Not readable!
-									debug_report_bug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable!", $dump));
+									reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
 								}
 							} // END - foreach
 							//* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
@@ -247,19 +246,20 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 							// Are some SQLs found?
 							if (countSqls() == 0) {
 								// Abort here
-								addFatalMessage(__FILE__, __LINE__, '{--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
 
+				// Are some fatal errors there?
 				if (ifFatalErrorsDetected()) {
 					$OUT = '';
 					foreach (getFatalArray() as $value) {
@@ -271,12 +271,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 						$OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
 					} // END foreach
 					$content['mysql_hidden'] = $OUT;
-					$content['spath']      = postRequestParameter('spath');
-					$content['burl']       = postRequestParameter('burl');
-					$content['title']      = postRequestParameter('title');
-					$content['smtp_host']  = postRequestParameter('smtp_host');
-					$content['smtp_user']  = postRequestParameter('smtp_user');
-					$content['smtp_pass']  = postRequestParameter('smtp_pass1');
+					$content['spath']      = postRequestElement('spath');
+					$content['burl']       = postRequestElement('burl');
+					$content['title']      = postRequestElement('title');
+					$content['smtp_host']  = postRequestElement('smtp_host');
+					$content['smtp_user']  = postRequestElement('smtp_user');
+					$content['smtp_pass']  = postRequestElement('smtp_pass1');
 
 					// Load template
 					addTemplateToInstallContent('install_fatal_errors', $content);
@@ -284,12 +284,18 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 					// 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__, '{--INSTALL_FINALIZER_FAILED--}');
+				addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_FINALIZER_FAILED--}');
 			}
 			break;
 
@@ -304,7 +310,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			break;
 
 		default:
-			logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
+			logDebugMessage(__FILE__, __LINE__, sprintf("Wrong install_page=%s detected", getRequestElement('install_page')));
 			addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
 			break;
 	} // END - switch