From ceac1d73f0b7ee50b26b2da2492556d2c6ba955d Mon Sep 17 00:00:00 2001 From: tgtje Date: Sun, 17 Jan 2016 23:43:36 +0100 Subject: [PATCH] reworked files (new defines; prev commit used existing defines) 1 comment line added for phpmin version --- e107_languages/English/lan_installer.php | 10 ++++++++++ install.php | 16 ++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php index 0f8cbd3b6..8c2fd7ac3 100644 --- a/e107_languages/English/lan_installer.php +++ b/e107_languages/English/lan_installer.php @@ -171,3 +171,13 @@ define("LANINS_126", "For security reasons you should now set the file permissio define("LANINS_127", "The database [x] already exists. Overwrite it? (any existing data will be lost)"); define("LANINS_128", "Overwrite"); define("LANINS_129", "Database not found."); + +define("LANINS_134", "Installation"); +define("LANINS_135", "of"); //single time use installer only as in .1 of 8 not replacing by LAN_SEARCH_12 +define("LANINS_136", "Deleted existing database"); +define("LANINS_137", "Found existing database"); +define("LANINS_138", "Version"); + +define("LANINS_141", "Please fill in the form below with your MySQL details. If you do not know this information, please contact your hosting provider. You may hover over each field for additional information."); +define("LANINS_142", "IMPORTANT: Please rename e107.htaccess to .htaccess"); +define("LANINS_144", "IMPORTANT: Please copy and paste the contents of the [b]e107.htaccess[/b] into your [b].htaccess[/b] file. Please take care NOT to overwrite any existing data that may be in it."); diff --git a/install.php b/install.php index 0816a21d3..9bf266e89 100644 --- a/install.php +++ b/install.php @@ -73,7 +73,7 @@ define('MAGIC_QUOTES_GPC', (ini_get('magic_quotes_gpc') ? true : false)); $php_version = phpversion(); if(version_compare($php_version, MIN_PHP_VERSION, "<")) { - die_fatal_error('A minimum version of PHP '.MIN_PHP_VERSION.' is required'); + die_fatal_error('A minimum version of PHP '.MIN_PHP_VERSION.' is required'); // no LAN DEF translation accepted by lower versions <5.3 } // Ensure that '.' is the first part of the include path @@ -440,7 +440,7 @@ class e_install // $this->template->SetTag("onload", "document.getElementById('name').focus()"); // $page_info = nl2br(LANINS_023); - $page_info = "
Please fill in the form below with your MySQL details. If you do not know this information, please contact your hosting provider. You may hover over each field for additional information.
"; + $page_info = "
".LANINS_141."
"; $e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); $isrequired = (($_SERVER['SERVER_ADDR'] == "127.0.0.1") || ($_SERVER['SERVER_ADDR'] == "localhost") || ($_SERVER['SERVER_ADDR'] == "::1") || preg_match('^192\.168\.\d{1,3}\.\d{1,3}$',$_SERVER['SERVER_ADDR'])) ? "" : "required='required'"; // Deals with IP V6, and 192.168.x.x address ranges, could be improved to validate x.x to a valid IP but for this use, I dont think its required to be that picky. @@ -670,7 +670,7 @@ class e_install { if($this->dbqry('DROP DATABASE `'.$this->previous_steps['mysql']['db'].'` ')) { - $page_content .= "
Deleted existing database"; + $page_content .= "
".LANINS_136; } else { @@ -688,7 +688,7 @@ class e_install } else { - $notification = "
Found existing database"; + $notification = "
".LANINS_137; $query = 'ALTER DATABASE `'.$this->previous_steps['mysql']['db'].'` CHARACTER SET `utf8` '; } @@ -1347,7 +1347,7 @@ class e_install { if(!rename("e107.htaccess",".htaccess")) { - $error = "IMPORTANT: Please rename e107.htaccess to .htaccess"; + $error = LANINS_142; } elseif($_SERVER['QUERY_STRING'] == "debug") { @@ -1357,7 +1357,7 @@ class e_install } elseif(file_exists("e107.htaccess")) { - $error = "IMPORTANT: Please copy and paste the contents of the e107.htaccess into your .htaccess file. Please take care NOT to overwrite any existing data that may be in it."; + $error = LANINS_144; } return $error; } @@ -2017,7 +2017,7 @@ function template_data()