X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=c24f262f5d9f77bf84a641a4f12367e506a86fe6;hp=f9ce4811d86f8057fe55d2c55be8cad977485725;hb=595124165eb35633520ee0c8e7d5196ba515c00f;hpb=feda50ff73c05935417ed33164d30caf966ba854 diff --git a/inc/install-inc.php b/inc/install-inc.php index f9ce4811d8..c24f262f5d 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -51,9 +51,9 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) 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); @@ -71,15 +71,15 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) } 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); @@ -89,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."
"); } } @@ -103,7 +103,7 @@ if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql' if (URL != "http://your-server.com") { // Already installed??? - $burl = URL; + $burl = constant('URL'); } elseif (empty($burl)) { // Auto-detect URL $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF']; @@ -115,25 +115,25 @@ 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 // Is MXChange installed or no admin registered so far? if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) @@ -164,12 +164,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT 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(""); + 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("
"); + OUTPUT_HTML("
"); } define('__MYSQL_HOST' , $mysql['host']); define('__MYSQL_DBASE' , $mysql['dbase']); @@ -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']; @@ -239,101 +239,101 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT define('__SMTP_HOST' , $_POST['smtp_host']); define('__SMTP_USER' , $_POST['smtp_user']); define('__SMTP_PASS' , $_POST['smtp_pass1']); - OUTPUT_HTML("
- - - - - - - - - - - - - - - - - + + +
- ".HEADER_TEXT_PAGE5." -
 
- ".TEXT_PAGE_5." -
 
".LANG_OUTPUT_MODE.":   - -
 
".WARN_NO_PASSWORD.":   - + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - -
+
{!HEADER_TEXT_PAGE5!} +
 
+ {!TEXT_PAGE_5!} +
 
{!LANG_OUTPUT_MODE!}:   + +
 
{!WARN_NO_PASSWORD!}:   + -
 
".LANG_WRITE_FOOTER.":   - +
 
{!LANG_WRITE_FOOTER!}:   + -
 
".INSTALL_ENABLE_BACKLINK.":   - -
 
"); + OUTPUT_HTML(">{!YES!} + + +
 
{!INSTALL_ENABLE_BACKLINK!}:   + +
 
"); foreach ($mysql as $key => $value) { - OUTPUT_HTML(" "); + OUTPUT_HTML(" "); } - OUTPUT_HTML(" - - - - - - - - -
 
-"); + OUTPUT_HTML(" + + + + + + + + +
 
+"); break; case "finalize": // Write captured data to files if ((!empty($_POST['finalize'])) && (!isBooleanConstantAndTrue('mxchange_installed'))) { // You have submitted data then we have to reset the fatal messages - $FATAL = array(); $SQLs = array(); + $SQLs = array(); // Connect to MySQL server $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__); @@ -348,24 +348,20 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT // Should be save here because file_exists() is there but we check it again. :) $file = secureString($_POST['spath']) . "install/" . $dump; if (FILE_READABLE($file)) { - // Load the file - $sql = implode("", file($file)); - - // Remove some unwanted chars - $sql = str_replace("\r", "", $sql); - $sql = str_replace("\n\n", "\n", $sql); + // Read the file + $SQLs = READ_FILE($file, true); // And split it up against ;\n ... - $SQLs = array_merge($SQLs, explode(";\n", $sql)); - } - } + $SQLs = merge_array($SQLs, explode(";\n", $sql)); + } // END - if + } // END - foreach // Are some SQLs found? if (count($SQLs) == 0) { // Abort here - ADD_FATAL(INSTALL_SQL_IMPORT_FAILED); + addFatalMessage(getMessage('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) { @@ -376,12 +372,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT 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); + 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); @@ -398,30 +394,23 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT 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 - { + } else { // Installation area not found! - ADD_FATAL(INSTALL_MISSING_DUMPS); + addFatalMessage(getMessage('INSTALL_MISSING_DUMPS')); } - } - } - if ((sizeof($FATAL) > 0) || ((isset($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) - { - $OUT .= " \n"; - } + foreach ($mysql as $key => $value) { + $OUT .= " \n"; + } // END foreach define('__MYSQL_DATA' , $OUT); define('__SPATH_VALUE' , $_POST['spath']); define('__BURL_VALUE' , $_POST['burl']); @@ -430,63 +419,29 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT define('__SMTP_USER' , $_POST['smtp_user']); define('__SMTP_PASS' , $_POST['smtp_pass']); - OUTPUT_HTML("
    - - - - - - - - - - - -
    - ".HEADER_MYSQL_ERRORS." -
     
    - ".TEXT_MYSQL_ERRORS." -
    -
      -".__FATAL_ERROR_LI." -
    -".__MYSQL_DATA." - - - - -
    -
    "); - } - else - { + // Load template + LOAD_TEMPLATE("install_fatal_errors"); + } else { // Installation is done! - $URL = $burl."/install.php?page=finalize"; - LOAD_URL($URL); + LOAD_URL($burl."/install.php?page=finalize"); } - } - elseif (isBooleanConstantAndTrue('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); - include ("inc/fatal_errors.php"); + 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 -{ - ADD_FATAL(ALREADY_INSTALLED); +} else { + addFatalMessage(ALREADY_INSTALLED); } // ?>