All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 3a7422e0ae73377bea5edebe449e60abf01b870b..c33ac6ed94b2433ad67d26278504529587ef77f3 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -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");
@@ -456,13 +431,13 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                } else {
                        // Something goes wrong during installation! :-(
                        addFatalMessage(INSTALL_FINALIZER_FAILED);
-                       include ("inc/fatal_errors.php");
+                       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 {