Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 50a31a3360e41cf0ff80e36356c364e50588e543..3a7422e0ae73377bea5edebe449e60abf01b870b 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -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'];
@@ -240,22 +240,22 @@ 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\"");
@@ -264,12 +264,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                if (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\"");
@@ -278,12 +278,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                if (!defined('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\"");
@@ -292,12 +292,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                if (!defined('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\"");
@@ -306,27 +306,27 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                if (!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;
 
@@ -409,7 +409,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                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']);
@@ -420,31 +420,31 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                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\">
+<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\">
+  </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>
+  </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>
+    <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>");
                        } else {
                                // Installation is done!