X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finstall-inc.php;h=6613994455a6a5085b056109ad1657c20656ac37;hb=5d0d05a99b39c75b54cd6b02c6093cf71532cd83;hp=6229a2b45c1e2ee66bc8b1298bc3778a7e60cb3f;hpb=cca98f57dff720b174d21d071cee8303462485d7;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 6229a2b45c..6613994455 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -41,97 +41,35 @@ if (!defined('__SECURITY')) {
require($INC);
}
-//
-function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) {
- // Initialize all and count up the "seak" value
- $done = false;
- $next = -1;
- $sneak++;
-
- if (FILE_READABLE($file)) {
- $search = "CFG: ".$comment;
- $tmp = $file.".tmp";
- $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
");
- if (is_resource($fp)) {
- $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
");
- if (is_resource($fp_tmp)) {
- while (!feof($fp)) {
- $line = fgets ($fp, 10240);
- //* DEBUG: */ echo $search."/".htmlentities($line)."
\n";
- $found = strpos($line, $search);
- //* DEBUG: */ echo "FOUND: ";
- //* DEBUG: */ var_dump($found);
- //* DEBUG: */ echo "
\n";
- if ($found !== false) $next = 0;
- if ($next > -1) {
- if ($next == $sneak) {
- $next = -1;
- $line = $prefix.$DATA.$suffix."\n";
- //* DEBUG: */ echo "NEW: ".htmlentities($line)."
\n";
- } else {
- $next++;
- }
- } // END - if
- //* DEBUG: */ echo "WRITE: ".htmlentities($line)."
\n";
- fputs($fp_tmp, $line);
- } // END - while
- fclose($fp_tmp);
-
- // Finished writing tmp file
- $done = true;
- } // END - if
-
- // Close source directory
- fclose($fp);
-
- if (($done) && (is_writeable($file))) {
- // Copy back tmp file and delete tmp :-)
- @copy($tmp, $file);
- @unlink($tmp);
- } else {
- OUTPUT_HTML("TMP: UNDONE!");
- }
- } // END - if
- } else {
- OUTPUT_HTML("404: ".$file."
");
- }
-}
-
-//
+// Init variables
$mysql = "";
-if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'];
-
-if (URL != "http://your-server.com") {
- // Already installed???
- $burl = URL;
-} elseif (empty($burl)) {
- // Auto-detect URL
- $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
- $burl = substr($burl, 0, strpos($burl, "install.php"));
-}
+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(INSTALL_SMTP_HOSTNAME_EMPTY."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."
");
+ 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(INSTALL_SMTP_PASS1_EMPTY."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."
");
+ 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(INSTALL_SMTP_PASS2_EMPTY."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."
");
+ 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(INSTALL_SMTP_PASS_MISMATCH."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
");
+ REQUEST_SET_GET('page', 3);
} // END - if
} // END - if
@@ -139,22 +77,17 @@ if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
{
// Set URL for FORM actions
- define('__BURL_ACTION', $burl);
+ 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");
break;
case "1": // Server path, base URL
- define('__PATH_LEN' , strlen(PATH));
- define('__BURL_LEN' , strlen($burl));
- define('__TITLE_LEN' , strlen(MAIN_TITLE));
- define('__SLOGAN_LEN' , strlen(SLOGAN));
- define('__WEBMASTER_LEN', (strlen(WEBMASTER) * 3));
-
+ // @Profi-Concept: Hab meine Meinung doch geaendert! :-)
// Load template
LOAD_TEMPLATE("install_page1");
break;
@@ -166,8 +99,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
if (getTotalFatalErrors() > 0) {
OUTPUT_HTML("");
- foreach ($FATAL as $key => $err) {
- OUTPUT_HTML(" · {!FATAL_NO!}".($key + 1).": ".$err."
");
+ foreach (getFatalArray() as $key => $err) {
+ OUTPUT_HTML(" · {--FATAL_NO--}".($key + 1).": ".$err."
");
}
OUTPUT_HTML("
");
}
@@ -175,11 +108,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");
@@ -187,21 +120,21 @@ 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 = SMTP_HOSTNAME;
- $smtpUser = SMTP_USER;
- $smtpPass1 = SMTP_PASSWORD;
- $smtpPass2 = SMTP_PASSWORD;
+ $smtpHost = constant('SMTP_HOSTNAME');
+ $smtpUser = constant('SMTP_USER');
+ $smtpPass1 = constant('SMTP_PASSWORD');
+ $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']);
@@ -223,11 +156,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']);
@@ -236,75 +169,75 @@ 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("