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

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 74cef5493551f8a770cf405d2de2fa5cd914ec03..9a7bd4b48448560efd80dd2a97184b6fda57fcfd 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -98,7 +98,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
                default:
                        // Huh, something goes wrong or maybe you have edited config.php ???
                        DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));
-                       mxchange_die("<strong>{!FATAL_ERROR!}:</strong> {!LANG_NO_RENDER_DIRECT!}");
+                       mxchange_die("<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}");
                        break;
                }
        } elseif ((constant('_OB_CACHING') == "on") && ($footer == 1)) {
@@ -857,10 +857,10 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
                @eval($tmpl_file);
        } elseif (!empty($template)) {
                // Template file not found!
-               $newContent = "{!TEMPLATE_404!}: ".$template."<br />
-{!TEMPLATE_CONTENT!}
+               $newContent = "{--TEMPLATE_404--}: ".$template."<br />
+{--TEMPLATE_CONTENT--}
 <pre>".print_r($content, true)."</pre>
-{!TEMPLATE_DATA!}
+{--TEMPLATE_DATA--}
 <pre>".print_r($DATA, true)."</pre>
 <br /><br />";
 
@@ -1197,9 +1197,9 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
        case "yn":
                $OUT .= "<option value=\"Y\"";
                if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
-               $OUT .= ">{!YES!}</option>\n<option value=\"N\"";
+               $OUT .= ">{--YES--}</option>\n<option value=\"N\"";
                if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
-               $OUT .= ">{!NO!}</option>\n";
+               $OUT .= ">{--NO--}</option>\n";
                break;
        }
        $OUT .= "    </select>\n";
@@ -1945,7 +1945,7 @@ function MEMBER_ACTION_LINKS ($uid, $status = "") {
        $eval = "\$OUT = \"[&nbsp;";
 
        foreach ($TARGETS as $tar) {
-               $eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"{!URL!}/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"{!ADMIN_LINK_";
+               $eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"{!URL!}/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"{--ADMIN_LINK_";
                //* DEBUG: */ echo "*".$tar."/".$status."*<br />\n";
                if (($tar == "lock_user") && ($status == "LOCKED")) {
                        // Locked accounts shall be unlocked
@@ -1954,7 +1954,7 @@ function MEMBER_ACTION_LINKS ($uid, $status = "") {
                        // All other status is fine
                        $eval .= strtoupper($tar);
                }
-               $eval .= "_TITLE!}\\\">{!ADMIN_";
+               $eval .= "_TITLE--}\\\">{--ADMIN_";
                if (($tar == "lock_user") && ($status == "LOCKED")) {
                        // Locked accounts shall be unlocked
                        $eval .= "UNLOCK_USER";
@@ -1962,7 +1962,7 @@ function MEMBER_ACTION_LINKS ($uid, $status = "") {
                        // All other status is fine
                        $eval .= strtoupper($tar);
                }
-               $eval .= "!}</a></span>&nbsp;|&nbsp;";
+               $eval .= "--}</a></span>&nbsp;|&nbsp;";
        }
 
        // Finish navigation link
@@ -3194,7 +3194,7 @@ function convertCodeToMessage ($code) {
        $msg = "";
        switch ($code) {
                case constant('CODE_LOGOUT_DONE')      : $msg = getMessage('LOGOUT_DONE'); break;
-               case constant('CODE_LOGOUT_FAILED')    : $msg = "<span class=\"guest_failed\">{!LOGOUT_FAILED!}</span>"; break;
+               case constant('CODE_LOGOUT_FAILED')    : $msg = "<span class=\"guest_failed\">{--LOGOUT_FAILED--}</span>"; break;
                case constant('CODE_DATA_INVALID')     : $msg = getMessage('MAIL_DATA_INVALID'); break;
                case constant('CODE_POSSIBLE_INVALID') : $msg = getMessage('MAIL_POSSIBLE_INVALID'); break;
                case constant('CODE_ACCOUNT_LOCKED')   : $msg = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;