X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=c2aa8b041e2be7b80ef040e5031bb156f6197c7b;hp=fb50b7134b41b8b9a79b67b9c448860d94f81ef8;hb=08b3c51b70b6498fd92a2760979d64470ad1b586;hpb=09f120bc3ab97a58ba6abbb519fbe124cebbbaed diff --git a/inc/install-inc.php b/inc/install-inc.php index fb50b7134b..c2aa8b041e 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -115,22 +115,22 @@ 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."
"); + OUTPUT_HTML(getMessage('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."
"); + OUTPUT_HTML(getMessage('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."
"); + OUTPUT_HTML(getMessage('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."
"); + OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
"); $_GET['page'] = 3; } // END - if } // END - if @@ -167,7 +167,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT if (getTotalFatalErrors() > 0) { OUTPUT_HTML(""); foreach ($FATAL as $key => $err) { - OUTPUT_HTML(" · {!FATAL_NO!}".($key + 1).": ".$err."
"); + OUTPUT_HTML(" · {--FATAL_NO--}".($key + 1).": ".$err."
"); } OUTPUT_HTML("
"); } @@ -194,10 +194,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT define('__EMAIL_VALUE' , $_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']; @@ -243,68 +243,68 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT - + - + - + - + @@ -312,7 +312,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT @@ -359,7 +359,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT // Are some SQLs found? if (count($SQLs) == 0) { // Abort here - addFatalMessage(INSTALL_SQL_IMPORT_FAILED); + addFatalMessage(getMessage('INSTALL_SQL_IMPORT_FAILED')); return; } // END - if @@ -376,8 +376,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT } // 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); + if ($_POST['spath'] != constant('PATH')) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0); + if ($_POST['burl'] != constant('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); @@ -396,7 +396,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0); } else { // Installation area not found! - addFatalMessage(INSTALL_MISSING_DUMPS); + addFatalMessage(getMessage('INSTALL_MISSING_DUMPS')); } } // END - if } // END - if @@ -430,18 +430,20 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT LOAD_TEMPLATE("install_finished"); } else { // Something goes wrong during installation! :-( - addFatalMessage(INSTALL_FINALIZER_FAILED); + addFatalMessage(getMessage('INSTALL_FINALIZER_FAILED')); LOAD_INC("inc/fatal_errors.php"); } break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected!}, $_GET['page'])); - OUTPUT_HTML("
{!WRONG_PAGE!}"); + DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected", $_GET['page'])); + OUTPUT_HTML("
{--WRONG_PAGE--}"); break; } } else { - addFatalMessage(ALREADY_INSTALLED); + // Already installed! + addFatalMessage(getMessage('ALREADY_INSTALLED')); } + // ?>
-
{!HEADER_TEXT_PAGE5!} +
{--HEADER_TEXT_PAGE5--}
 
- {!TEXT_PAGE_5!} + {--TEXT_PAGE_5--}
 
{!LANG_OUTPUT_MODE!}:  {--LANG_OUTPUT_MODE--}:  
 
{!WARN_NO_PASSWORD!}:  {--WARN_NO_PASSWORD--}:  
 
{!LANG_WRITE_FOOTER!}:  {--LANG_WRITE_FOOTER--}:  
 
{!INSTALL_ENABLE_BACKLINK!}:  {--INSTALL_ENABLE_BACKLINK--}:  
"); foreach ($mysql as $key => $value) { - OUTPUT_HTML(" "); + OUTPUT_HTML(" "); } OUTPUT_HTML(" @@ -322,7 +322,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT - +