X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finstall-inc.php;h=50a31a3360e41cf0ff80e36356c364e50588e543;hb=49ffe0a4fb551d0965e97db1ad4ff12f13f4b9ad;hp=0909dd89bf3fee2de708c419b5fce8427bbe8321;hpb=a69aa088bc83e105e496f22fdff1378076eceb0b;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 0909dd89bf..50a31a3360 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -36,39 +36,50 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
$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_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++;
}
- }
+ } // 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);
@@ -78,11 +89,11 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
@copy($tmp, $file);
@unlink($tmp);
} else {
- OUTPUT_HTML("TMP: UNDONE!");
+ OUTPUT_HTML("TMP: UNDONE!");
}
- }
+ } // END - if
} else {
- OUTPUT_HTML("404: ".$file."
");
+ OUTPUT_HTML("404: ".$file."
");
}
}
@@ -93,7 +104,7 @@ if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'
if (URL != "http://your-server.com") {
// Already installed???
$burl = URL;
-} elseif ($burl == "") {
+} elseif (empty($burl)) {
// Auto-detect URL
$burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
$burl = substr($burl, 0, strpos($burl, "install.php"));
@@ -106,26 +117,26 @@ if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
// Hostname not set
OUTPUT_HTML(INSTALL_SMTP_HOSTNAME_EMPTY."
");
$_GET['page'] = 3;
- }
+ } // END - if
if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
// Password is empty
OUTPUT_HTML(INSTALL_SMTP_PASS1_EMPTY."
");
$_GET['page'] = 3;
- }
+ } // END - if
if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
// Password repeat is empty
OUTPUT_HTML(INSTALL_SMTP_PASS2_EMPTY."
");
$_GET['page'] = 3;
- }
+ } // END - if
if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
// Passwords are not matching
OUTPUT_HTML(INSTALL_SMTP_PASS_MISMATCH."
");
$_GET['page'] = 3;
- }
-}
+ } // END - if
+} // END - if
// 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);
@@ -153,12 +164,12 @@ if ((!mxchange_installed) || (!admin_registered))
if (empty($mysql['login'])) $mysql['login'] = "your_login";
if (empty($mysql['host'])) $mysql['host'] = "localhost";
if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
- if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) {
- OUTPUT_HTML("");
- foreach ($FATAL as $key=>$err) {
- OUTPUT_HTML(" · ".FATAL_NO.($key + 1).": ".$err."
\n");
+ if (getTotalFatalErrors() > 0) {
+ OUTPUT_HTML("");
+ foreach ($FATAL as $key => $err) {
+ OUTPUT_HTML(" · {!FATAL_NO!}".($key + 1).": ".$err."
");
}
- OUTPUT_HTML("
");
+ OUTPUT_HTML("
");
}
define('__MYSQL_HOST' , $mysql['host']);
define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -228,115 +239,101 @@ if ((!mxchange_installed) || (!admin_registered))
define('__SMTP_HOST' , $_POST['smtp_host']);
define('__SMTP_USER' , $_POST['smtp_user']);
define('__SMTP_PASS' , $_POST['smtp_pass1']);
- OUTPUT_HTML("
");
+");
break;
case "finalize": // Write captured data to files
- if (!empty($_POST['finalize'])) {
+ if ((!empty($_POST['finalize'])) && (!isBooleanConstantAndTrue('mxchange_installed'))) {
// You have submitted data then we have to reset the fatal messages
- $FATAL = array();
+ $SQLs = array();
// Connect to MySQL server
$link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
@@ -345,138 +342,131 @@ if ((!mxchange_installed) || (!admin_registered))
$db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__);
if ($db) {
// Automatically run install.sql
- if (file_exists($_POST['spath']."install/tables.sql")) {
- $ERRORS = $_POST['spath']."inc/sql.err";
- $cmd = array(
- // "Dump" tha' s*** up... ;-) > /dev/null
- "mysql ".$mysql['dbase']." --force --host=".$mysql['host']." --user=".$mysql['login']." --password=".$mysql['pass1']." < ".$_POST['spath']."install/tables.sql",
- "mysql ".$mysql['dbase']." --force --host=".$mysql['host']." --user=".$mysql['login']." --password=".$mysql['pass1']." < ".$_POST['spath']."install/menu-".GET_LANGUAGE().".sql"
- );
-
- foreach ($cmd as $c) {
- @system($c);
- }
+ if ((FILE_READABLE($_POST['spath']."install/tables.sql")) && (FILE_READABLE($_POST['spath']."install/menu-".GET_LANGUAGE().".sql"))) {
+ // Both exists so import them
+ foreach (array("tables.sql", "menu-".GET_LANGUAGE().".sql") as $dump) {
+ // Should be save here because file_exists() is there but we check it again. :)
+ $file = secureString($_POST['spath']) . "install/" . $dump;
+ if (FILE_READABLE($file)) {
+ // Read the file
+ $SQLs = READ_FILE($file, true);
- if ((file_exists($ERRORS)) && (filesize($ERRORS) > 0)) {
- ADD_FATAL(MYSQLDUMP_ERROR);
- } elseif (!mxchange_installed) {
- // Remove error file if empty
- if (file_exists($ERRORS)) @unlink ($ERRORS);
-
- // 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 ('ENABLED_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);
- 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);
-
- // Close the link
- SQL_CLOSE($link, __FILE__, __LINE__);
- }
- else
- {
- ADD_FATAL(INSTALL_MAYBE_DONE);
- }
- }
- else
- {
+ // And split it up against ;\n ...
+ $SQLs = merge_array($SQLs, explode(";\n", $sql));
+ } // END - if
+ } // END - foreach
+
+ // Are some SQLs found?
+ if (count($SQLs) == 0) {
+ // Abort here
+ addFatalMessage(INSTALL_SQL_IMPORT_FAILED);
+ return;
+ } // END - if
+
+ // Now run all queries through and try to keep out empty or comment queries
+ foreach ($SQLs as $sql) {
+ // Trim spaces away
+ $sql = trim($sql);
+
+ // Is this query not empty and not a comment?
+ if ((!empty($sql)) && (substr($sql, 0, 2) != "--") && (substr($sql, 0, 1) != "#")) {
+ // Then run it!
+ SQL_QUERY($sql, __FILE__, __LINE__);
+ } // END - if
+ } // END - foreach
+
+ // 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", "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);
+ } else {
// Installation area not found!
- ADD_FATAL(INSTALL_MISSING_DUMPS);
+ addFatalMessage(INSTALL_MISSING_DUMPS);
}
- }
- }
- if ((sizeof($FATAL) > 0) || ($FATAL[0] != ""))
- {
+ } // END - if
+ } // END - if
+
+ if (getTotalFatalErrors() > 0) {
$OUT = "";
- foreach ($FATAL as $value)
- {
- $OUT .= " ".$value."\n";
- }
+ foreach ($FATAL as $value) {
+ $OUT .= " ".$value."\n";
+ } // END foreach
define('__FATAL_ERROR_LI', $OUT);
$OUT = "";
- foreach ($mysql as $key=>$value)
- {
+ foreach ($mysql as $key => $value) {
$OUT .= " \n";
- }
+ } // END foreach
define('__MYSQL_DATA' , $OUT);
define('__SPATH_VALUE' , $_POST['spath']);
define('__BURL_VALUE' , $_POST['burl']);
define('__TITLE_VALUE' , $_POST['title']);
define('__SMTP_HOST' , $_POST['smtp_host']);
define('__SMTP_USER' , $_POST['smtp_user']);
- define('__SMTP_PASS1' , $_POST['smtp_pass1']);
- define('__SMTP_PASS2' , $_POST['smtp_pass2']);
+ define('__SMTP_PASS' , $_POST['smtp_pass']);
- OUTPUT_HTML("");
- }
- else
- {
+");
+ } else {
// Installation is done!
- $URL = $burl."/install.php?page=finalize";
- LOAD_URL($URL);
+ LOAD_URL($burl."/install.php?page=finalize");
}
- }
- elseif (mxchange_installed)
- {
+ } elseif (isBooleanConstantAndTrue('mxchange_installed')) {
// Redirection after writing data... :-)
LOAD_TEMPLATE("install_finished");
- }
- else
- {
+ } else {
// Something goes wrong during installation! :-(
- ADD_FATAL(INSTALL_FINALIZER_FAILED);
+ addFatalMessage(INSTALL_FINALIZER_FAILED);
include ("inc/fatal_errors.php");
}
break;
default:
- OUTPUT_HTML(" ".WRONG_PAGE."");
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected.", $_GET['page']));
+ OUTPUT_HTML(" ".WRONG_PAGE."");
break;
}
-}
- else
-{
- ADD_FATAL(ALREADY_INSTALLED);
+} else {
+ addFatalMessage(ALREADY_INSTALLED);
}
//
?>