Even more constants/language strings rewritten, merge_array() now logs debug messages
[mailer.git] / inc / install-inc.php
index 50a31a3360e41cf0ff80e36356c364e50588e543..c24f262f5d9f77bf84a641a4f12367e506a86fe6 100644 (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,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."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
        if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
                // Password is empty
-               OUTPUT_HTML(INSTALL_SMTP_PASS1_EMPTY."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
        if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
                // Password repeat is empty
-               OUTPUT_HTML(INSTALL_SMTP_PASS2_EMPTY."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."<br />");
                $_GET['page'] = 3;
        } // END - if
        if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
                // Passwords are not matching
-               OUTPUT_HTML(INSTALL_SMTP_PASS_MISMATCH."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."<br />");
                $_GET['page'] = 3;
        } // END - if
 } // END - if
@@ -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'];
@@ -240,93 +240,93 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                define('__SMTP_USER'    , $_POST['smtp_user']);
                define('__SMTP_PASS'    , $_POST['smtp_pass1']);
                OUTPUT_HTML("<form action=\"{!__BURL_ACTION!}/install.php?page=finalize\" method=\"POST\" target=\"_self\">
-<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
-<TR>
-  <TD colspan=\"2\" align=\"center\">
+<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
+<tr>
+  <td colspan=\"2\" align=\"center\">
     <div class=\"install\">{!HEADER_TEXT_PAGE5!}</strong>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD colspan=\"2\"><span class=\"install_intro\">
+  </td>
+</tr>
+<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td colspan=\"2\"><span class=\"install_intro\">
     {!TEXT_PAGE_5!}
-  </span></TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">{!LANG_OUTPUT_MODE!}:&nbsp;&nbsp;</TD>
-  <TD>
+  </span></td>
+</tr>
+<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td class=\"install\" align=\"right\">{!LANG_OUTPUT_MODE!}:&nbsp;&nbsp;</td>
+  <td>
     <select name=\"omode\" size=\"1\" class=\"install_select\">
       <option value=\"render\"");
-               if (OUTPUT_MODE == "render") OUTPUT_HTML(" selected=\"selected\"");
+               if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!MODE_RENDER!}</option>
       <option value=\"direct\"");
-               if (OUTPUT_MODE == "direct") OUTPUT_HTML(" selected=\"selected\"");
+               if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!MODE_DIRECT!}</option>
     </select>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">{!WARN_NO_PASSWORD!}:&nbsp;&nbsp;</TD>
-  <TD>
+  </td>
+</tr>
+<tr><td colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td class=\"install\" align=\"right\">{!WARN_NO_PASSWORD!}:&nbsp;&nbsp;</td>
+  <td>
     <select name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
                if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!YES!}</option>
       <option value=\"false\"");
-               if (!defined('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+               if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!NO!}</option>
     </select>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">{!LANG_WRITE_FOOTER!}:&nbsp;&nbsp;</TD>
-  <TD>
+  </td>
+</tr>
+<tr><td colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td class=\"install\" align=\"right\">{!LANG_WRITE_FOOTER!}:&nbsp;&nbsp;</td>
+  <td>
     <select name=\"wfooter\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
                if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!YES!}</option>
       <option value=\"false\"");
-               if (!defined('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+               if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!NO!}</option>
     </select>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">{!INSTALL_ENABLE_BACKLINK!}:&nbsp;&nbsp;</TD>
-  <TD>
+  </td>
+</tr>
+<tr><td colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td class=\"install\" align=\"right\">{!INSTALL_ENABLE_BACKLINK!}:&nbsp;&nbsp;</td>
+  <td>
     <select name=\"blink\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-               if (ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!YES!}</option>
       <option value=\"false\"");
-               if (!ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
                OUTPUT_HTML(">{!NO!}</option>
     </select>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD colspan=\"2\" align=\"center\">");
+  </td>
+</tr>
+<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td colspan=\"2\" align=\"center\">");
                foreach ($mysql as $key => $value) {
-                       OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key!}]\" value=\"".$value!}\">");
+                       OUTPUT_HTML("    <input type=\"hidden\" name=\"mysql[".$key."!}]\" value=\"".$value."!}\">");
                }
-               OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\">
-    <INPUT type=\"hidden\" name=\"burl\" value=\"{!__BURL_VALUE!}\" />
-    <INPUT type=\"hidden\" name=\"title\" value=\"{!__TITLE_VALUE!}\" />
-    <INPUT type=\"hidden\" name=\"slogan\" value=\"{!__SLOGAN_VALUE!}\" />
-    <INPUT type=\"hidden\" name=\"email\" value=\"{!__EMAIL_VALUE!}\" />
-    <INPUT type=\"hidden\" name=\"smtp_host\" value=\"{!__SMTP_HOST!}\" />
-    <INPUT type=\"hidden\" name=\"smtp_user\" value=\"{!__SMTP_USER!}\" />
-    <INPUT type=\"hidden\" name=\"smtp_pass\" value=\"{!__SMTP_PASS!}\" />
-    <INPUT type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"{!NEXT_PAGE!}\" class=\"install_submit\" />
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-</TABLE>
+               OUTPUT_HTML("    <input type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\">
+    <input type=\"hidden\" name=\"burl\" value=\"{!__BURL_VALUE!}\" />
+    <input type=\"hidden\" name=\"title\" value=\"{!__TITLE_VALUE!}\" />
+    <input type=\"hidden\" name=\"slogan\" value=\"{!__SLOGAN_VALUE!}\" />
+    <input type=\"hidden\" name=\"email\" value=\"{!__EMAIL_VALUE!}\" />
+    <input type=\"hidden\" name=\"smtp_host\" value=\"{!__SMTP_HOST!}\" />
+    <input type=\"hidden\" name=\"smtp_user\" value=\"{!__SMTP_USER!}\" />
+    <input type=\"hidden\" name=\"smtp_pass\" value=\"{!__SMTP_PASS!}\" />
+    <input type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"{!NEXT_PAGE!}\" class=\"install_submit\" />
+  </td>
+</tr>
+<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
+</table>
 </form>");
                break;
 
@@ -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,20 +396,20 @@ 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
 
                        if (getTotalFatalErrors() > 0) {
                                $OUT = "";
-                               foreach ($FATAL as $value) {
+                               foreach ($FATAL as $value) {
                                        $OUT .= "    <li>".$value."</li>\n";
                                } // END foreach
                                define('__FATAL_ERROR_LI', $OUT);
                                $OUT = "";
                                foreach ($mysql as $key => $value) {
-                                       $OUT .= "    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">\n";
+                                       $OUT .= "    <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">\n";
                                } // END foreach
                                define('__MYSQL_DATA'   , $OUT);
                                define('__SPATH_VALUE'  , $_POST['spath']);
@@ -419,33 +419,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                define('__SMTP_USER'    , $_POST['smtp_user']);
                                define('__SMTP_PASS'    , $_POST['smtp_pass']);
 
-                               OUTPUT_HTML("<form action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
-<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
-<TR>
-  <TD align=\"center\">
-    <div class=\"install\">".HEADER_MYSQL_ERRORS."</strong>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD><span class=\"install_intro\">
-    ".TEXT_MYSQL_ERRORS."
-  </span></TD>
-</TR>
-<TR>
-  <TD align=\"center\"><strong>
-    <ol>
-".__FATAL_ERROR_LI."
-    </ol>
-".__MYSQL_DATA."
-    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
-    <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
-    <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
-    <INPUT type=\"submit\" class=\"admin_submit\" name=\"ok\" value=\"".RETURN_MYSQL_PAGE."\">
-  </strong></TD>
-</TR>
-</TABLE>
-</form>");
+                               // Load template
+                               LOAD_TEMPLATE("install_fatal_errors");
                        } else {
                                // Installation is done!
                                LOAD_URL($burl."/install.php?page=finalize");
@@ -455,14 +430,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                        LOAD_TEMPLATE("install_finished");
                } else {
                        // Something goes wrong during installation! :-(
-                       addFatalMessage(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("    <div class=\"install_error\">".WRONG_PAGE."</strong>");
+               DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected!}, $_GET['page']));
+               OUTPUT_HTML("    <div class=\"install_error\">{!WRONG_PAGE!}</strong>");
                break;
        }
 } else {