X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=5f9fede1c27f7ed416f8fda48a8aad31897120b3;hb=a79fc75a2304a53e5418b25607ccabbecad929c6;hp=043c701cfcadb65afcf79cae53fa278981ffedad;hpb=bd6d4243597eb81b104801b91ad942ce4efa5bf1;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 043c701cfc..5f9fede1c2 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -36,36 +36,47 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
//
function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) {
- $done = false; $sneak++;
- if (file_exists($file)) {
+ // Initialize all and count up the "seak" value
+ $done = false;
+ $next = -1;
+ $sneak++;
+
+ if ((file_exists($file)) && (is_readable($file))) {
$search = "CFG: ".$comment;
$tmp = $file.".tmp";
- $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
");
+ $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
");
if (is_resource($fp)) {
- $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
");
+ $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
");
if (is_resource($fp_tmp)) {
while (!feof($fp)) {
$line = fgets ($fp, 10240);
- if (strpos($line, $search) > -1) $next = 0;
+ //* 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++;
}
}
+ //* DEBUG: */ echo "WRITE: ".htmlentities($line)."
\n";
fputs($fp_tmp, $line);
}
fclose($fp_tmp);
+
// Finished writing tmp file
$done = true;
}
@@ -82,7 +93,7 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
}
}
} else {
- OUTPUT_HTML("404: ".$file."
");
+ OUTPUT_HTML("404: ".$file."
");
}
}
@@ -125,7 +136,7 @@ if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
}
// Is MXChange installed or no admin registered so far?
-if ((!mxchange_installed) || (!admin_registered))
+if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
{
// Set URL for FORM actions
define('__BURL_ACTION', $burl);
@@ -156,9 +167,9 @@ if ((!mxchange_installed) || (!admin_registered))
if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) {
OUTPUT_HTML("");
foreach ($FATAL as $key=>$err) {
- OUTPUT_HTML(" · ".FATAL_NO.($key + 1).": ".$err."
\n");
+ OUTPUT_HTML(" · ".FATAL_NO.($key + 1).": ".$err."
");
}
- OUTPUT_HTML("
");
+ OUTPUT_HTML("
");
}
define('__MYSQL_HOST' , $mysql['host']);
define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -261,10 +272,10 @@ if ((!mxchange_installed) || (!admin_registered))
|
@@ -275,24 +286,10 @@ if ((!mxchange_installed) || (!admin_registered))
- |
-
- |
-
- ".LANG_FRAMESET_ACTIVE.": |
-
-
|
@@ -334,7 +331,7 @@ if ((!mxchange_installed) || (!admin_registered))
break;
case "finalize": // Write captured data to files
- if ((!empty($_POST['finalize'])) && (!mxchange_installed)) {
+ if ((!empty($_POST['finalize'])) && (!isBooleanConstantAndTrue('mxchange_installed'))) {
// You have submitted data then we have to reset the fatal messages
$FATAL = array(); $SQLs = array();
@@ -383,25 +380,24 @@ if ((!mxchange_installed) || (!admin_registered))
}
// Ok, all done. So we can write the config data to the php files
- if ($_POST['spath'] != PATH) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define ('PATH', \"", "\");", $_POST['spath'], 0);
- if ($_POST['burl'] != URL) install_WriteData($_POST['spath']."inc/config.php", "HOST-URL", "define ('URL', \"", "\");", $_POST['burl'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "MAIN_TITLE", "define ('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "SLOGAN", "define ('SLOGAN', \"", "\");", $_POST['slogan'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "WEBMASTER", "define ('WEBMASTER', \"", "\");", $_POST['email'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define ('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define ('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define ('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
- // install_WriteData($_POST['spath']."inc/config.php", "FRAMESET", "define ('frameset_active', ", ");", $_POST['frameset'], 0);
- // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define ('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
+ if ($_POST['spath'] != PATH) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0);
+ if ($_POST['burl'] != URL) install_WriteData($_POST['spath']."inc/config.php", "HOST-URL", "define('URL', \"", "\");", $_POST['burl'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "MAIN_TITLE", "define('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "SLOGAN", "define('SLOGAN', \"", "\");", $_POST['slogan'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "WEBMASTER", "define('WEBMASTER', \"", "\");", $_POST['email'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
+ // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", " 'host' => \"", "\",", $mysql['host'], 0);
install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", " 'dbase' => \"", "\",", $mysql['dbase'], 0);
install_WriteData($_POST['spath']."inc/config.php", "MYSQL-LOGIN", " 'login' => \"", "\",", $mysql['login'], 0);
install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define ('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define ('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "SMTP-USER", "define ('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define ('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
- install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define ('mxchange_installed', ", ");", "true", 0);
+ install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
+ install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
// Close the link
SQL_CLOSE($link, __FILE__, __LINE__);
@@ -413,7 +409,7 @@ if ((!mxchange_installed) || (!admin_registered))
}
}
}
- if ((sizeof($FATAL) > 0) || ($FATAL[0] != ""))
+ if ((sizeof($FATAL) > 0) || ($FATAL[0] != ''))
{
$OUT = "";
foreach ($FATAL as $value)
@@ -469,7 +465,7 @@ if ((!mxchange_installed) || (!admin_registered))
LOAD_URL($URL);
}
}
- elseif (mxchange_installed)
+ elseif (isBooleanConstantAndTrue('mxchange_installed'))
{
// Redirection after writing data... :-)
LOAD_TEMPLATE("install_finished");