More language constants rewritten ({--LANGUAGE--} is for constants)

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index c24f262f5d9f77bf84a641a4f12367e506a86fe6..f2cc829fee8603a206e886f5eb75c73f7db10aed 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -167,7 +167,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                if (getTotalFatalErrors() > 0) {
                        OUTPUT_HTML("<span class=\"install_fatal\">");
                        foreach ($FATAL as $key => $err) {
-                               OUTPUT_HTML("  <strong>&middot;</strong>&nbsp;{!FATAL_NO!}".($key + 1).":&nbsp;".$err."<br />");
+                               OUTPUT_HTML("  <strong>&middot;</strong>&nbsp;{--FATAL_NO--}".($key + 1).":&nbsp;".$err."<br />");
                        }
                        OUTPUT_HTML("</span><br />");
                }
@@ -243,68 +243,68 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
 <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <tr>
   <td colspan=\"2\" align=\"center\">
-    <div class=\"install\">{!HEADER_TEXT_PAGE5!}</strong>
+    <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\">
-    {!TEXT_PAGE_5!}
+    {--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 class=\"install\" align=\"right\">{--LANG_OUTPUT_MODE--}:&nbsp;&nbsp;</td>
   <td>
     <select name=\"omode\" size=\"1\" class=\"install_select\">
       <option value=\"render\"");
                if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">{!MODE_RENDER!}</option>
+               OUTPUT_HTML(">{--MODE_RENDER--}</option>
       <option value=\"direct\"");
                if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">{!MODE_DIRECT!}</option>
+               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 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>
+               OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
                if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">{!NO!}</option>
+               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 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>
+               OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
                if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">{!NO!}</option>
+               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 class=\"install\" align=\"right\">{--INSTALL_ENABLE_BACKLINK--}:&nbsp;&nbsp;</td>
   <td>
     <select name=\"blink\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
                if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">{!YES!}</option>
+               OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
                if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">{!NO!}</option>
+               OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
 </tr>
@@ -312,7 +312,7 @@ 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!}\" />
@@ -322,7 +322,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
     <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\" />
+    <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>
@@ -436,12 +436,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                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 {
-       addFatalMessage(ALREADY_INSTALLED);
+       addFatalMessage(getMessage('ALREADY_INSTALLED'));
 }
 //
 ?>