X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=0909dd89bf3fee2de708c419b5fce8427bbe8321;hb=c5fd1576c8686a444b2ac24ec84827f687fc9a3a;hp=94dfbb38a5bf592b30de5a515216b4d1792494f2;hpb=5ef6ed7373ae85e5635e39e2a0adf9496a8add05;p=mailer.git diff --git a/inc/install-inc.php b/inc/install-inc.php index 94dfbb38a5..0909dd89bf 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -43,11 +43,9 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) } // -function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $SNEAK=0) -{ - $done = false; $SNEAK++; - if (file_exists($file)) - { +function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) { + $done = false; $sneak++; + if (file_exists($file)) { $search = "CFG: ".$comment; $tmp = $file.".tmp"; $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); @@ -58,7 +56,7 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $SNEAK=0) $line = fgets ($fp, 10240); if (strpos($line, $search) > -1) $next = 0; if ($next > -1) { - if ($next == $SNEAK) { + if ($next == $sneak) { $next = -1; $line = $prefix.$DATA.$suffix."\n"; } else { @@ -92,18 +90,41 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $SNEAK=0) $mysql = ""; if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql']; -if (URL != "http://your-server.com") -{ +if (URL != "http://your-server.com") { // Already installed??? $burl = URL; -} - elseif ($burl == "") -{ +} elseif ($burl == "") { // Auto-detect URL $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF']; $burl = substr($burl, 0, strpos($burl, "install.php")); } -// + +// Check if both passwords from SMTP are matching +if ((isset($_GET['page']) && ($_GET['page'] == 5))) { + // Okay, we have to check it + if (!empty($_POST['smtp_user']) && (empty($_POST['smtp_host']))) { + // Hostname not set + OUTPUT_HTML(INSTALL_SMTP_HOSTNAME_EMPTY."
"); + $_GET['page'] = 3; + } + if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) { + // Password is empty + OUTPUT_HTML(INSTALL_SMTP_PASS1_EMPTY."
"); + $_GET['page'] = 3; + } + if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) { + // Password repeat is empty + OUTPUT_HTML(INSTALL_SMTP_PASS2_EMPTY."
"); + $_GET['page'] = 3; + } + if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) { + // Passwords are not matching + OUTPUT_HTML(INSTALL_SMTP_PASS_MISMATCH."
"); + $_GET['page'] = 3; + } +} + +// Is MXChange installed or no admin registered so far? if ((!mxchange_installed) || (!admin_registered)) { // Set URL for FORM actions @@ -132,11 +153,9 @@ 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]))) - { + if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) { OUTPUT_HTML(""); - foreach ($FATAL as $key=>$err) - { + foreach ($FATAL as $key=>$err) { OUTPUT_HTML(" · ".FATAL_NO.($key + 1).": ".$err."
\n"); } OUTPUT_HTML("
"); @@ -155,12 +174,60 @@ if ((!mxchange_installed) || (!admin_registered)) LOAD_TEMPLATE("install_page2"); break; + 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']); + + // Use default SMTP data + $smtpHost = SMTP_HOSTNAME; + $smtpUser = SMTP_USER; + $smtpPass1 = SMTP_PASSWORD; + $smtpPass2 = 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']; + + // MySQL settings + define('__MYSQL_HOST' , $mysql['host']); + define('__MYSQL_DBASE' , $mysql['dbase']); + define('__MYSQL_PREFIX' , $mysql['prefix']); + define('__MYSQL_LOGIN' , $mysql['login']); + define('__MYSQL_PASS1' , $mysql['pass1']); + define('__MYSQL_PASS2' , $mysql['pass2']); + + // Set constants for SMTP data + define('__SMTP_HOST' , $smtpHost); + define('__SMTP_USER' , $smtpUser); + define('__SMTP_PASS1' , $smtpPass1); + define('__SMTP_PASS2' , $smtpPass2); + + // Load template + LOAD_TEMPLATE("install_page3"); + break; + case "5": // Misc 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']); + // 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']); + + // MySQL settings + define('__MYSQL_HOST' , $mysql['host']); + define('__MYSQL_DBASE' , $mysql['dbase']); + define('__MYSQL_PREFIX' , $mysql['prefix']); + 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']); OUTPUT_HTML("
@@ -188,7 +255,7 @@ if ((!mxchange_installed) || (!admin_registered)) - + - + - + - + @@ -265,22 +334,18 @@ if ((!mxchange_installed) || (!admin_registered)) break; case "finalize": // Write captured data to files - if (!empty($_POST['finalize'])) - { + if (!empty($_POST['finalize'])) { // You have submitted data then we have to reset the fatal messages $FATAL = array(); // Connect to MySQL server $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__); - if ($link) - { + if ($link) { // Seems to work, also right database? $db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__); - if ($db) - { + if ($db) { // Automatically run install.sql - if (file_exists($_POST['spath']."install/tables.sql")) - { + if (file_exists($_POST['spath']."install/tables.sql")) { $ERRORS = $_POST['spath']."inc/sql.err"; $cmd = array( // "Dump" tha' s*** up... ;-) > /dev/null @@ -288,17 +353,13 @@ if ((!mxchange_installed) || (!admin_registered)) "mysql ".$mysql['dbase']." --force --host=".$mysql['host']." --user=".$mysql['login']." --password=".$mysql['pass1']." < ".$_POST['spath']."install/menu-".GET_LANGUAGE().".sql" ); - foreach ($cmd as $c) - { + foreach ($cmd as $c) { @system($c); } - if ((file_exists($ERRORS)) && (filesize($ERRORS) > 0)) - { + if ((file_exists($ERRORS)) && (filesize($ERRORS) > 0)) { ADD_FATAL(MYSQLDUMP_ERROR); - } - elseif (!mxchange_installed) - { + } elseif (!mxchange_installed) { // Remove error file if empty if (file_exists($ERRORS)) @unlink ($ERRORS); @@ -318,6 +379,9 @@ if ((!mxchange_installed) || (!admin_registered)) 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 @@ -348,10 +412,14 @@ if ((!mxchange_installed) || (!admin_registered)) { $OUT .= " \n"; } - define('__MYSQL_DATA' , $OUT); - define('__SPATH_VALUE', $_POST['spath']); - define('__BURL_VALUE' , $_POST['burl']); - define('__TITLE_VALUE', $_POST['title']); + 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']); OUTPUT_HTML("
 
 
".WARN_NO_PASSWORD.":   @@ -202,7 +269,7 @@ if ((!mxchange_installed) || (!admin_registered))
 
 
".LANG_WRITE_FOOTER.":   @@ -216,7 +283,7 @@ if ((!mxchange_installed) || (!admin_registered))
 
 
".LANG_FRAMESET_ACTIVE.":   @@ -230,7 +297,7 @@ if ((!mxchange_installed) || (!admin_registered))
 
 
".INSTALL_ENABLE_BACKLINK.":   @@ -247,8 +314,7 @@ if ((!mxchange_installed) || (!admin_registered))
 
"); - foreach ($mysql as $key=>$value) - { + foreach ($mysql as $key=>$value) { OUTPUT_HTML(" "); } OUTPUT_HTML(" @@ -256,6 +322,9 @@ if ((!mxchange_installed) || (!admin_registered)) + + +
@@ -391,14 +459,7 @@ if ((!mxchange_installed) || (!admin_registered)) elseif (mxchange_installed) { // Redirection after writing data... :-) - OUTPUT_HTML("".INSTALL_FINISHED."
-
-".INSTALL_FIN_SECU."
-
- - - -"); + LOAD_TEMPLATE("install_finished"); } else {