X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finstall-inc.php;h=9b3814ae09c637881ca648b59b28fd7eb7939a2e;hb=aa63aed07428a99ea09002c8d072990677700080;hp=c852bdd5d71685ef6ae1403980d940f999cdae23;hpb=e72031bcfdcd8e91f62bec6cc88f36b7a11d9221;p=mailer.git

diff --git a/inc/install-inc.php b/inc/install-inc.php
index c852bdd5d7..9b3814ae09 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die Installationsroutine         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -37,19 +42,16 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-// Load sql_patches here
-LOAD_EXTENSION("sql_patches");
-
 // Init variables
-$mysql = "";
+$mysql = array();
 if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
 
 // Check if both passwords from SMTP are matching
-if ((REQUEST_ISSET_GET(('page')) && (REQUEST_GET('page') == 5))) {
+if ((REQUEST_ISSET_GET('page') && (REQUEST_GET('page') == 5))) {
 	// Okay, we have to check it
 	if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
 		// Hostname not set
@@ -99,7 +101,8 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 		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['prefix'])) $mysql['prefix'] = "mxchange";
+		if (empty($mysql['type']))   $mysql['type']   = "MyISAM";
 		if (getTotalFatalErrors() > 0) {
 			OUTPUT_HTML("<span class=\"install_fatal\">");
 			foreach (getFatalArray() as $key => $err) {
@@ -110,6 +113,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 		define('__MYSQL_HOST'  , $mysql['host']);
 		define('__MYSQL_DBASE' , $mysql['dbase']);
 		define('__MYSQL_PREFIX', $mysql['prefix']);
+		define('__TABLE_TYPE'  , $mysql['type']);
 		define('__MYSQL_LOGIN' , $mysql['login']);
 		define('__SPATH_VALUE' , REQUEST_POST('spath'));
 		define('__BURL_VALUE'  , REQUEST_POST('burl'));
@@ -143,6 +147,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 		define('__MYSQL_HOST'	, $mysql['host']);
 		define('__MYSQL_DBASE'	, $mysql['dbase']);
 		define('__MYSQL_PREFIX'	, $mysql['prefix']);
+		define('__TABLE_TYPE'	, $mysql['type']);
 		define('__MYSQL_LOGIN'	, $mysql['login']);
 		define('__MYSQL_PASS1'	, $mysql['pass1']);
 		define('__MYSQL_PASS2'	, $mysql['pass2']);
@@ -169,6 +174,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 		define('__MYSQL_HOST'	, $mysql['host']);
 		define('__MYSQL_DBASE'	, $mysql['dbase']);
 		define('__MYSQL_PREFIX'	, $mysql['prefix']);
+		define('__TABLE_TYPE'	, $mysql['type']);
 		define('__MYSQL_LOGIN'	, $mysql['login']);
 
 		// SMTP settings
@@ -194,10 +200,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"omode\" size=\"1\" class=\"install_select\">
       <option value=\"render\"");
-		if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(" selected=\"selected\"");
+		if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--MODE_RENDER--}</option>
       <option value=\"direct\"");
-		if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(" selected=\"selected\"");
+		if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--MODE_DIRECT--}</option>
     </select>
   </td>
@@ -208,10 +214,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-		if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+		if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-		if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
@@ -222,10 +228,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"wfooter\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-		if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+		if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-		if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
@@ -236,10 +242,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"blink\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-		if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
+		if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-		if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
+		if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(' selected="selected"');
 		OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
@@ -248,9 +254,9 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 <tr>
   <td colspan=\"2\" align=\"center\">");
 		foreach ($mysql as $key => $value) {
-			OUTPUT_HTML("    <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
+			OUTPUT_HTML("    <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\" />");
 		}
-		OUTPUT_HTML("    <input type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\">
+		OUTPUT_HTML("    <input type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\" />
     <input type=\"hidden\" name=\"burl\" value=\"{!__BURL_VALUE!}\" />
     <input type=\"hidden\" name=\"title\" value=\"{!__TITLE_VALUE!}\" />
     <input type=\"hidden\" name=\"slogan\" value=\"{!__SLOGAN_VALUE!}\" />
@@ -268,7 +274,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 
 	case "finalize": // Write captured data to files
 		if ((REQUEST_ISSET_POST(('finalize'))) && (!isInstalled())) {
-			// You have submitted data then we have to reset the fatal messages
+			// You have submitted data then we have to reset the SQLs
 			INIT_SQLS();
 
 			// Connect to MySQL server
@@ -279,13 +285,23 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 					// Automatically run install.sql
 					if ((FILE_READABLE(REQUEST_POST('spath')."install/tables.sql")) && (FILE_READABLE(REQUEST_POST('spath')."install/menu-".GET_LANGUAGE().".sql"))) {
 						// Both exists so import them
-						foreach (array("tables.sql", "menu-".GET_LANGUAGE().".sql") as $dump) {
+						foreach (array("tables", "menu-".GET_LANGUAGE()) as $dump) {
 							// Should be save here because file_exists() is there but we check it again. :)
-							$FQFN = secureString(REQUEST_POST('spath')) . "install/" . $dump;
+							$FQFN = REQUEST_POST('spath') . "install/" . $dump . ".sql";
 							if (FILE_READABLE($FQFN)) {
 								// Read the file
 								$fileContent = READ_FILE($FQFN, true);
 
+								// Replace the {!prefix!} with actual one
+								while (strpos($fileContent, "{!prefix!}") !== false) {
+									$fileContent = str_replace("{!prefix!}", $mysql['prefix'], $fileContent);
+								} // END - while
+
+								// Replace the {!type!} with actual one
+								while (strpos($fileContent, "{!type!}") !== false) {
+									$fileContent = str_replace("{!type!}", $mysql['type'], $fileContent);
+								} // END - while
+
 								// And split it up against ;\n ...
 								SET_SQLS(merge_array(GET_SQLS(), explode(";\n", $fileContent)));
 							} else {
@@ -302,7 +318,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 						} // END - if
 
 						// Now run all queries through and try to keep out empty or comment queries
-						RUN_FILTER('run_sqls', array('dry_run' => false));
+						runFilterChain('run_sqls');
 
 						// Ok, all done. So we can write the config data to the php files
 						if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", REQUEST_POST('spath'), 0);
@@ -319,6 +335,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 						changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-LOGIN", "	'login'    => \"", "\",", $mysql['login'], 0);
 						changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PASSWORD", "	'password' => \"", "\",", $mysql['pass1'], 0);
 						changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
+						changeDataInFile(REQUEST_POST('spath')."inc/config.php", "TABLE-TYPE", "define('_TABLE_TYPE', \"", "\");", $mysql['type'], 0);
 						changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", REQUEST_POST('smtp_host'), 0);
 						changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", REQUEST_POST('smtp_user'), 0);
 						changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", REQUEST_POST('smtp_pass1'), 0);
@@ -331,12 +348,12 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 			} // END - if
 
 			if (getTotalFatalErrors() > 0) {
-				$OUT = "";
+				$OUT = '';
 				foreach (getFatalArray() as $value) {
 					$OUT .= "    <li>".$value."</li>\n";
 				} // END foreach
 				define('__FATAL_ERROR_LI', $OUT);
-				$OUT = "";
+				$OUT = '';
 				foreach ($mysql as $key => $value) {
 					$OUT .= "    <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">\n";
 				} // END foreach
@@ -349,18 +366,18 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 				define('__SMTP_PASS'	, REQUEST_POST('smtp_pass1'));
 
 				// Load template
-				LOAD_TEMPLATE("install_fatal_errors");
+				LOAD_TEMPLATE('install_fatal_errors');
 			} else {
 				// Installation is done!
-				LOAD_URL("install.php?page=finalize");
+				LOAD_URL('install.php?page=finalize');
 			}
 		} elseif (isInstalled()) {
 			// Redirection after writing data... :-)
-			LOAD_TEMPLATE("install_finished");
+			LOAD_TEMPLATE('install_finished');
 		} else {
 			// Something goes wrong during installation! :-(
 			addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
-			LOAD_INC("inc/fatal_errors.php");
+			LOAD_INC('inc/fatal_errors.php');
 		}
 		break;