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 3c92ccf635a47835f1bce352ce7eb143e3766ca2..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'];
@@ -312,17 +312,17 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 <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\" />
+               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>
@@ -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']);
@@ -438,10 +438,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 ".__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."\">
+    <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>