X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=c852bdd5d71685ef6ae1403980d940f999cdae23;hb=af0d7727246bdfb13ab844727ac75750ad5d21b7;hp=dad33f5438c98e51f9164c01a92ab512dc337287;hpb=d52156d35605388b7554c31d08bc29f0bb167079;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index dad33f5438..c852bdd5d7 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -41,46 +41,49 @@ if (!defined('__SECURITY')) {
require($INC);
}
+// Load sql_patches here
+LOAD_EXTENSION("sql_patches");
+
// Init variables
$mysql = "";
-if ((isset($_POST['mysql'])) && (is_array($_POST['mysql']))) $mysql = $_POST['mysql'];
+if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
// Check if both passwords from SMTP are matching
-if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
+if ((REQUEST_ISSET_GET(('page')) && (REQUEST_GET('page') == 5))) {
// Okay, we have to check it
- if (!empty($_POST['smtp_user']) && (empty($_POST['smtp_host']))) {
+ if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
// Hostname not set
OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."
");
- $_GET['page'] = 3;
+ REQUEST_SET_GET('page', 3);
} // END - if
- if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
+ if ((!REQUEST_ISSET_POST(('smtp_pass1'))) && (REQUEST_ISSET_POST(('smtp_pass2')))) {
// Password is empty
OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."
");
- $_GET['page'] = 3;
+ REQUEST_SET_GET('page', 3);
} // END - if
- if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
+ if ((REQUEST_ISSET_POST(('smtp_pass1'))) && (!REQUEST_ISSET_POST(('smtp_pass2')))) {
// Password repeat is empty
OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."
");
- $_GET['page'] = 3;
+ REQUEST_SET_GET('page', 3);
} // END - if
- if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
+ if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
// Passwords are not matching
OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
");
- $_GET['page'] = 3;
+ REQUEST_SET_GET('page', 3);
} // END - if
} // END - if
// Is MXChange installed or no admin registered so far?
-if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
+if ((!isInstalled()) || (!isAdminRegistered()))
{
// Set URL for FORM actions
define('__BURL_ACTION', constant('URL'));
// Output page for entered value
- switch ($_GET['page'])
+ switch (REQUEST_GET('page'))
{
case "welcome": // Welcome to the installation!
LOAD_TEMPLATE("install_welcome");
@@ -99,7 +102,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
if (getTotalFatalErrors() > 0) {
OUTPUT_HTML("");
- foreach ($FATAL as $key => $err) {
+ foreach (getFatalArray() as $key => $err) {
OUTPUT_HTML(" · {--FATAL_NO--}".($key + 1).": ".$err."
");
}
OUTPUT_HTML("
");
@@ -108,11 +111,11 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
define('__MYSQL_DBASE' , $mysql['dbase']);
define('__MYSQL_PREFIX', $mysql['prefix']);
define('__MYSQL_LOGIN' , $mysql['login']);
- define('__SPATH_VALUE' , $_POST['spath']);
- define('__BURL_VALUE' , $_POST['burl']);
- define('__TITLE_VALUE' , $_POST['title']);
- define('__SLOGAN_VALUE', $_POST['slogan']);
- define('__EMAIL_VALUE' , $_POST['email']);
+ define('__SPATH_VALUE' , REQUEST_POST('spath'));
+ define('__BURL_VALUE' , REQUEST_POST('burl'));
+ define('__TITLE_VALUE' , REQUEST_POST('title'));
+ define('__SLOGAN_VALUE', REQUEST_POST('slogan'));
+ define('__EMAIL_VALUE' , REQUEST_POST('email'));
// Load template
LOAD_TEMPLATE("install_page2");
@@ -120,11 +123,11 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
case "3":
// Set more values
- define('__SPATH_VALUE' , $_POST['spath']);
- define('__BURL_VALUE' , $_POST['burl']);
- define('__TITLE_VALUE' , $_POST['title']);
- define('__SLOGAN_VALUE' , $_POST['slogan']);
- define('__EMAIL_VALUE' , $_POST['email']);
+ define('__SPATH_VALUE' , REQUEST_POST('spath'));
+ define('__BURL_VALUE' , REQUEST_POST('burl'));
+ define('__TITLE_VALUE' , REQUEST_POST('title'));
+ define('__SLOGAN_VALUE' , REQUEST_POST('slogan'));
+ define('__EMAIL_VALUE' , REQUEST_POST('email'));
// Use default SMTP data
$smtpHost = constant('SMTP_HOSTNAME');
@@ -133,8 +136,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
$smtpPass2 = constant('SMTP_PASSWORD');
// Overwrite it with the data from sent (failed) form
- if (!empty($_POST['smtp_host'])) $smtpHost = $_POST['smtp_host'];
- if (!empty($_POST['smtp_user'])) $smtpUser = $_POST['smtp_user'];
+ if (REQUEST_ISSET_POST(('smtp_host'))) $smtpHost = REQUEST_POST('smtp_host');
+ if (REQUEST_ISSET_POST(('smtp_user'))) $smtpUser = REQUEST_POST('smtp_user');
// MySQL settings
define('__MYSQL_HOST' , $mysql['host']);
@@ -156,11 +159,11 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
case "5": // Misc settings
// General settings
- define('__SPATH_VALUE' , $_POST['spath']);
- define('__BURL_VALUE' , $_POST['burl']);
- define('__TITLE_VALUE' , $_POST['title']);
- define('__SLOGAN_VALUE' , $_POST['slogan']);
- define('__EMAIL_VALUE' , $_POST['email']);
+ define('__SPATH_VALUE' , REQUEST_POST('spath'));
+ define('__BURL_VALUE' , REQUEST_POST('burl'));
+ define('__TITLE_VALUE' , REQUEST_POST('title'));
+ define('__SLOGAN_VALUE' , REQUEST_POST('slogan'));
+ define('__EMAIL_VALUE' , REQUEST_POST('email'));
// MySQL settings
define('__MYSQL_HOST' , $mysql['host']);
@@ -169,9 +172,9 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
define('__MYSQL_LOGIN' , $mysql['login']);
// SMTP settings
- define('__SMTP_HOST' , $_POST['smtp_host']);
- define('__SMTP_USER' , $_POST['smtp_user']);
- define('__SMTP_PASS' , $_POST['smtp_pass1']);
+ define('__SMTP_HOST' , REQUEST_POST('smtp_host'));
+ define('__SMTP_USER' , REQUEST_POST('smtp_user'));
+ define('__SMTP_PASS' , REQUEST_POST('smtp_pass1'));
OUTPUT_HTML("