X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=06c7e1fc7254850ff79c083762040896254a7ce3;hb=4fe584c2e58ca2babe4141c1f4e8a595ec7a3ee9;hp=d0283dfcfde28cee4c2686b6c06e2d9baa19b2cf;hpb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a;p=mailer.git

diff --git a/inc/install-inc.php b/inc/install-inc.php
index d0283dfcfd..06c7e1fc72 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                  *
@@ -41,11 +46,8 @@ if (!defined('__SECURITY')) {
 	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
@@ -100,6 +102,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 		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) {
 			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
@@ -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 {
@@ -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);