Way more usage of EL code:
authorRoland Häder <roland@mxchange.org>
Tue, 5 Jul 2011 03:50:45 +0000 (03:50 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 5 Jul 2011 03:50:45 +0000 (03:50 +0000)
- Way more EL code introduced by replacing direct calls in PHP scripts with EL
  code in templates
- TODOs.txt updated

70 files changed:
DOCS/TODOs.txt
birthday_confirm.php
inc/classes/cachesystem.class.php
inc/extensions-functions.php
inc/functions.php
inc/language/birthday_de.php
inc/language/de.php
inc/language/holiday_de.php
inc/language/primera_de.php
inc/language/sponsor_de.php
inc/language/wernis_de.php
inc/libs/bonus_functions.php
inc/libs/network_functions.php
inc/libs/rallye_functions.php
inc/libs/sponsor_functions.php
inc/libs/surfbar_functions.php
inc/libs/task_functions.php
inc/libs/user_functions.php
inc/libs/wernis_functions.php
inc/module-functions.php
inc/modules/admin.php
inc/modules/admin/admin-inc.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-adminedit.php
inc/modules/admin/what-config_cats.php
inc/modules/admin/what-config_register.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-del_holiday.php
inc/modules/admin/what-del_sponsor.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-extensions.php
inc/modules/admin/what-list_cats.php
inc/modules/admin/what-list_country.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_network_api_translation.php
inc/modules/admin/what-list_network_params.php
inc/modules/admin/what-list_network_types.php
inc/modules/admin/what-list_refs.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_sponsor_pay.php
inc/modules/admin/what-list_sponsor_pays.php
inc/modules/admin/what-list_task.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-list_yoomedia_tm.php
inc/modules/admin/what-lock_sponsor.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-logs.php
inc/modules/admin/what-overview.php
inc/modules/admin/what-repair_amnu.php
inc/modules/admin/what-repair_cats.php
inc/modules/admin/what-repair_gmnu.php
inc/modules/admin/what-repair_mmnu.php
inc/modules/admin/what-theme_import.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/admin/what-user_contct.php
inc/modules/guest/what-mediadata.php
inc/modules/guest/what-sponsor_login.php
inc/modules/member/what-cash_coupon.php
inc/modules/member/what-holiday.php
inc/modules/member/what-mydata.php
inc/modules/member/what-primera.php
inc/modules/member/what-refback.php
inc/modules/member/what-transfer.php
inc/modules/member/what-unconfirmed.php
inc/modules/member/what-wernis.php
inc/modules/sponsor/account.php
inc/modules/sponsor/settings.php
inc/mysql-manager.php
inc/template-functions.php

index 2f29fb7..d403b8c 100644 (file)
@@ -4,7 +4,7 @@
 ./beg.php:171:                 // @TODO Opps, what is missing here???
 ./birthday_confirm.php:93:             // @TODO Try to rewrite the following unset()
 ./inc/cache/config-local.php:124:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:505:       // @TODO Add support for more types which break in last else-block
+./inc/classes/cachesystem.class.php:504:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:136:        // @TODO Make this all better... :-/
 ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
 ./inc/daily/daily_birthday.php:95:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/modules/member/what-transfer.php:134:                            // @TODO Rewrite this to a filter
 ./inc/modules/member/what-transfer.php:223:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
 ./inc/modules/member/what-transfer.php:96:                     // @TODO Rewrite this to a filter
-./inc/modules/member/what-unconfirmed.php:142: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/member/what-unconfirmed.php:207:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
+./inc/modules/member/what-unconfirmed.php:138: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-unconfirmed.php:203:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
 ./inc/modules/order.php:74:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:64:    // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1220:  // @TODO Rewrite this to a filter
index f95f1f1..8619fc7 100644 (file)
@@ -102,7 +102,7 @@ if (SQL_NUMROWS($result) == 1) {
                $content['message'] = loadTemplate('birthday_msg', true, $data);
        } else {
                // Unconfirmed / locked accounts cannot get points
-               $content['message'] = getMaskedMessage('MEMBER_BIRTHDAY_CANNOT_STATUS', translateUserStatus($data['status']));
+               $content['message'] = '{%message,MEMBER_BIRTHDAY_CANNOT_STATUS=' . $data['status'] . '%}';
        }
 } else {
        // Cannot load data!
index aaaebe6..05e488a 100644 (file)
@@ -290,8 +290,7 @@ class CacheSystem {
                        } // END - if
                } else {
                        // Cache file not found or not readable
-                       debug_report_bug(__METHOD__, __LINE__, $this->name);
-                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMaskedMessage('CACHE_CANNOT_LOAD', $this->fqfn));
+                       debug_report_bug(__METHOD__, __LINE__, '{%message,CACHE_CANNOT_LOAD=' . $this->name . '%}');
 
                        // Try to remove it
                        $this->removeCacheFile();
@@ -347,7 +346,7 @@ class CacheSystem {
                                $this->rebuilt[$this->name] = true;
                        } else {
                                // Not removed!
-                               addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMaskedMessage('CACHE_CANNOT_UNLINK', $this->fqfn));
+                               debug_report_bug(__METHOD__, __LINE__, '{%message,CACHE_CANNOT_UNLINK=' . $this->name . '%}');
                        }
                } // END - if
        }
@@ -375,7 +374,7 @@ class CacheSystem {
 
                                // Close cache file
                                $this->finalize();
-                       }
+                       } // END - if
                } else {
                        // Cannot write to cache!
                        addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
index 430fd65..87744d1 100644 (file)
@@ -1020,7 +1020,7 @@ function createNewExtensionTask ($ext_name) {
        // Not installed and do we have created a task for the admin?
        if (($taskId == '0') && (!isExtensionInstalled($ext_name))) {
                // Set default message if ext-foo is missing
-               $message = getMaskedMessage('ADMIN_EXTENSION_TEXT_FILE_MISSING', $ext_name);
+               $message = '{%message,ADMIN_EXTENSION_TEXT_FILE_MISSING=' . $ext_name . '%}';
 
                // Template file
                $FQFN = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
index 333de57..72bb546 100644 (file)
@@ -1186,7 +1186,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('COOKIES_DISABLED')   : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
                case getCode('BEG_SAME_AS_OWN')    : $message = '{--BEG_SAME_USERID_AS_OWN--}'; break;
                case getCode('LOGIN_FAILED')       : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break;
-               case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break;
+               case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestParameter('mod') . '%}'; break;
                case getCode('OVERLENGTH')         : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
                case getCode('URL_FOUND')          : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;
                case getCode('SUBJECT_URL')        : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break;
@@ -1248,7 +1248,7 @@ function getMessageFromErrorCode ($code) {
 
                default:
                        // Missing/invalid code
-                       $message = getMaskedMessage('UNKNOWN_MAILID_CODE', $code);
+                       $message = '{%message,UNKNOWN_MAILID_CODE=' . $code . '%}';
 
                        // Log it
                        logDebugMessage(__FUNCTION__, __LINE__, $message);
index 47d5d6d..64b81b9 100644 (file)
@@ -46,7 +46,7 @@ addMessages(array(
        'ADMIN_CONFIG_BIRTHDAY_TITLE' => "Einstellungen zu Geburtstagsmails",
        'ADMIN_CONFIG_BIRTHDAY_POINTS' => "{?POINTS?} als &quot;Geburtstagsgeschenk&quot;",
        'ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE' => "Wert <strong>0</strong> deaktiviert die Extragutschrift.",
-       'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">%s</span>",
+       'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">{%%pipe,translateUserStatus=%s%%}</span>",
        'MEMBER_BIRTHDAY_CANNOT_LOAD_DATA' => "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag.",
        'ADMIN_CONFIG_SELECT_BIRTHDAY_MODE' => "Verg&uuml;tungsmodus der {?POINTS?}",
        'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
index a3ee494..c59498b 100644 (file)
@@ -948,10 +948,10 @@ addMessages(array(
        'DIRECT_PAYMENT_SUBJECT' => "Direkte {?POINTS?}-Gutschrift durch das System",
        'ADMIN_LOGOUT_SQL_PATCHES_DONE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung <strong>sql_patches</strong> installiert haben und dabei das Passort-Hashing ge&auml;ndert/verbessert wurde. Bitte erneut einloggen.",
        'ADMIN_LOGOUT_SQL_PATCHES_REMOVE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung <strong>sql_patches</strong> entfernt haben. Bitte klicken Sie weiter, um jetzt das Passwort neu zu setzen.",
-       'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied <span class=\"data\">%s {?POINTS?}</span> zur&uuml;ckgeschrieben.",
-       'ADMIN_POINTS_TO_JACKPOT' => "Es wurden <span class=\"data\">%s {?POINTS?}</span> in den Jackpot gelegt.",
+       'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> zur&uuml;ckgeschrieben.",
+       'ADMIN_POINTS_TO_JACKPOT' => "Es wurden <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> in den Jackpot gelegt.",
        'ADMIN_NO_POINTS_REPAYED' => "Die Mailbuchung hatte keine {?POINTS?} zum zur&uuml;ckbuchen.",
-       'ADMIN_POINTS_SHREDDED' => "Es wurden <span class=\"data\">%s {?POINTS?}</span> geschrettert.",
+       'ADMIN_POINTS_SHREDDED' => "Es wurden <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> geschrettert.",
        'ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
        'ADMIN_EXTENSION_PROBLEM_EXTENSION_OUTDATED' => "Die Erweiterung <span class=\"data\">%s</span> ist veraltet. Ihre Version: <span class=\"data\">{%%ext,version=%s%%}</span>, erwartete Version: <span class=\"data\">%s</span>.",
        'ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
@@ -1057,7 +1057,7 @@ addMessages(array(
        'FATAL_EXTENSION_LOADED' => "Erweiterung <span class=\"data\">%s</span> bereits geladen.",
        'ADMIN_ACCESS_DENIED' => "Zugriff auf den Adminmen&uuml;punkt <span class=\"data\">%s</span> nicht gestattet.",
        'ADMIN_URL_BLACKLIST_DISABLED' => "URL-Sperrliste ist deaktiviert.",
-       'ADMIN_MENU_IS_EMPTY' => "Das von Ihnen ausgew&auml;hlte Men&uuml; <span class=\"data\">%s</span> ist leer.",
+       'ADMIN_MENU_IS_EMPTY' => "Das von Ihnen ausgew&auml;hlte Men&uuml; <span class=\"data\">{%pipe,getAction%}</span> ist leer.",
        'ADMIN_EXTENSION_TEXT_FILE_MISSING' => "Die Erweiterung <span class=\"data\">%s</span> hat keinen Beschreibungstext. Bitte melden Sie dies uns <a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direkter Link zum Bug-Tracker\">im Bug-Tracker</a>.",
        'GUEST_STATS_NO_CLICKS' => "Keine Klicks in Ihrem {?mt_word?} verzeichnet.",
        'ADMIN_EXTENSIONS_REMOVED' => "Es wurden <span class=\"data\">%s</span> Erweiterungen aus Ihrem {?mt_word?} entfernt.",
@@ -1067,7 +1067,7 @@ addMessages(array(
        'ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE' => "Die Erweiterung &#39;%s&#39; sollten Sie nur installieren, wenn Sie daran mitentwickeln wollen. Produktiv ist diese nicht einsatzbereit.",
        'ADMIN_ENTRIES_404' => "Es wurden keine Eintr&auml;ge gefunden.",
        'DEBUG_REPORT_BUG_SUBJECT' => "[BUG!] Es wurde ein Bug im Script erkannt:",
-       'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.",
+       'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung <span class=\"data\">{%%pipe,getExtensionName=%s%%}</span> kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.",
        'MEMBER_REFERAL_LINKS_FOOTER' => "Ihr Referal-Link eingebaut in Ihrer Homepage bringt Ihnen passiv mehr Referals. (Aber Ihren Referal-Link bewerben schadet auch nicht... ;-) )",
        'POINTS_ORDER' => "Werbeguthaben",
        'MEMBER_TOTAL_POINTS' => "Gesamtguthaben",
index 461f380..ce58b3e 100644 (file)
@@ -78,7 +78,7 @@ addMessages(array(
        'MEMBER_HOLIDAY_TIME_LOCK' => "Urlaubsschaltung eingerichtet",
        'MEMBER_HOLIDAY_LOCKED' => "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht wieder deaktivieren, da Sie diese erst vor Kurzem aktiviert haben.",
        'MEMBER_HOLIDAY_ORDER' => "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht ver&auml;ndern, da Ihre letzte Mailbuchung zu kurz her ist! Letzte Buchung: <span class=\"data\">%s</span>",
-       'MEMBER_HOLIDAY_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Mitglieder-Id <span class=\"data\">%s</span> nicht gefunden.",
+       'MEMBER_HOLIDAY_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Ihre Mitglieder-Id <span class=\"data\">{%pipe,getMemberId%}</span> wurde nicht gefunden.",
 
        // Subject lines
        // - Admin
index 0dce952..76b3218 100644 (file)
@@ -114,6 +114,7 @@ addMessages(array(
        'MEMBER_PRIMERA_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens <span class=\"data\">{%config,translateComma=primera_min_payout%}</span> Primera an.",
        'MEMBER_PRIMERA_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! R&uuml;ckmeldung f&uuml;r den Support: <span class=\"data\">%s</span>.",
        'MEMBER_PRIMERA_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)",
+       'MEMBER_PRIMERA_PAYPOUT_FAILED' => "Die Auszahlung hat nicht geklappt! R&uuml;ckmeldung f&uuml;r den Support: <span class=\"data\">%s</span>.",
        'MEMBER_PRIMERA_PAYOUT_DONE' => "Auszahlung auf Primus-Portal erfolgreich abgeschlossen. :-)",
        'MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED' => "Sie k&ouml;nnen nicht <span class=\"data\">%s</span> Primera auszahlen, da Sie nur <span class=\"data\">%s</span> &uuml;brig haben.",
        'MEMBER_PRIMERA_STATUS' => "&Uuml;berweisungsart",
index a7adaee..19b3a8c 100644 (file)
@@ -293,7 +293,7 @@ addMessages(array(
        'SPONSOR_ACCOUNT_DATA_SAVED' => "Ihre Daten wurden gespeichert.",
        'SPONSOR_ACCOUNT_EMAIL_CHANGED' => "Sie haben Ihre EMail-Adresse ge&auml;ndert, Account wurde tempor&auml;r gesperrt. Bitte [<a href=\"{%url=index.php%}\">hier klicken</a>], um in den Gastbereich zu gelangen.",
        'SPONSOR_SETTINGS_HEADER' => "Einstellungen Ihres Sponsorenaccounts",
-       'SPONSOR_UNKNOWN_WHAT' => "Scripte-Fehler: Unbekannte Sponsor-Aktion <span class=\"data\">%s</span> erkannt.",
+       'SPONSOR_UNKNOWN_WHAT' => "Scripte-Fehler: Unbekannte Sponsor-Aktion <span class=\"data\">{%pipe,getWhat%}</span> erkannt.",
        'SPONSOR_SETTINGS_SAVED' => "Neue Einstellungen gespeichert.",
 
 // Error messages
index 157b286..f48aa00 100644 (file)
@@ -125,8 +125,9 @@ addMessages(array(
        'MEMBER_WERNIS_INVALID_AMOUNT' => "Bitte nur Zahlen f&uuml;r den zu &uuml;berweisenden Betrag eingeben.",
        'MEMBER_WERNIS_WITHDRAW_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens <span class=\"data\">{%config,translateComma=wernis_min_withdraw%}</span> Wernis f&uuml;r die Einzahlung an.",
        'MEMBER_WERNIS_PAYOUT_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens <span class=\"data\">{%config,translateComma=wernis_min_payout%}</span> Wernis f&uuml;r die Auszahlung an.",
-       'MEMBER_WERNIS_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! R&uuml;ckmeldung f&uuml;r den Support: <span class=\"data\">%s</span>.",
+       'MEMBER_WERNIS_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! R&uuml;ckmeldung f&uuml;r den Support: <span class=\"data\">{%pipe,GET_WERNIS_ERROR_MESSAGE%}</span>.",
        'MEMBER_WERNIS_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)",
+       'MEMBER_WERNIS_PAYOUT_FAILED' => "Die Auszahlung hat nicht geklappt! R&uuml;ckmeldung f&uuml;r den Support: <span class=\"data\">{%pipe,GET_WERNIS_ERROR_MESSAGE%}</span>.",
        'MEMBER_WERNIS_PAYOUT_DONE' => "Auszahlung auf WDS66-Hauptaccount erfolgreich abgeschlossen. :-)",
        'MEMBER_WERNIS_PAYOUT_POINTS_DEPLETED' => "Sie k&ouml;nnen nicht <span class=\"data\">%s</span> Wernis auszahlen, da Sie nur <span class=\"data\">%s</span> &uuml;brig haben.",
        'MEMBER_WERNIS_STATUS' => "&Uuml;berweisungsart",
index 9033627..7bbf24e 100644 (file)
@@ -203,7 +203,7 @@ LIMIT 1",
                // @TODO Move this HTML to a template
                $OUT = '<tr>
   <td colspan="3" align="center" height="30" class="bottom">
-    <div class="notice">' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '</div>
+    <div class="notice">{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}</div>
   </td>
 </tr>';
        }
index a87d16c..3895fd7 100644 (file)
@@ -677,25 +677,25 @@ function generateNetworkActiveOptions ($default = '') {
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME');
+       return '{--ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME--}';
 }
 
 // Translates the network type handler (e.g. banner, paidmail) for templates
 function translateNetworkTypeHandler ($type) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_TYPES_' . strtoupper($type) . '');
+       return '{--ADMIN_NETWORK_TYPES_' . strtoupper($type) . '--}';
 }
 
 // Translates request type
 function translateNetworkRequestType ($type) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '');
+       return '{--ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '--}';
 }
 
 // Translates request parameter
 function translateNetworkRequestParameter ($param) {
        // Get the message id
-       return getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '');
+       return '{--ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '--}';
 }
 
 // Translates API index
@@ -977,7 +977,7 @@ function doAdminNetworkProcessChangeNetwork () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       displayMessage(getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
+                       displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
@@ -1004,7 +1004,7 @@ function doAdminNetworkProcessRemoveNetwork () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       displayMessage(getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
+                       displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
@@ -1097,7 +1097,7 @@ function doAdminNetworkProcessChangeNetworkType () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       displayMessage(getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
+                       displayMessage('{%message,ADMIN_NETWORK_TYPES_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
@@ -1148,7 +1148,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       displayMessage(getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
+                       displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
@@ -1175,7 +1175,7 @@ function doAdminNetworkProcessRemoveNetworkType () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       displayMessage(getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
+                       displayMessage('{%message,ADMIN_NETWORK_TYPES_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
@@ -1202,7 +1202,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       displayMessage(getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
+                       displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
                        loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
index f048598..b3fb7f1 100644 (file)
@@ -166,7 +166,7 @@ WHERE
        if ($notify == 'Y') $templ = 'admin_rallye_notify';
 
        // Send email to admin
-       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_NOTIFY', $title), $templ, $prices);
+       sendAdminNotification('{%message,RALLYE_ADMIN_NOTIFY=' . $title . '%}', $templ, $prices);
 
        // Free memory
        SQL_FREERESULT($result_user);
@@ -211,7 +211,7 @@ ORDER BY
                SQL_FREERESULT($result_prices);
        } else {
                // No prices???
-               $prices = getMaskedMessage('RALLYE_MEMBER_NO_PRICES', $mode);
+               $prices = '{%message,RALLYE_MEMBER_NO_PRICES=' . $mode . '%}';
        }
 
        // Add last line for email mode
@@ -546,7 +546,7 @@ function markReferalRallyesAsExpired ($result) {
        }
 
        // Send mail to admin
-       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJECT', $title), $templ, $count);
+       sendAdminNotification('{%message,RALLYE_ADMIN_EXPIRED_SUBJECT=' . $title . '%}', $templ, $count);
 
        // Add task (we ignore the task id here)
        createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -782,12 +782,12 @@ WHERE
                // Expire found rallyes and notify admin
                while ($content = SQL_FETCHARRAY($result_rallye)) {
                        // Prepare data for mail template
-                       $content['start_time']  = generateDateTime($content['start_time'], 1);
-                       $content['end_time']    = generateDateTime($content['end_time']  , 1);
-                       $content['now_time']    = generateDateTime(time(), 1);
+                       $content['start_time'] = generateDateTime($content['start_time'], 1);
+                       $content['end_time']   = generateDateTime($content['end_time']  , 1);
+                       $content['now_time']   = generateDateTime(time(), 1);
 
                        // Send mail to admin
-                       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJECT', $content['title']), 'admin_rallye_purged', $content);
+                       sendAdminNotification('{%message,RALLYE_ADMIN_PURGED_SUBJECT=' . $content['title'] . '%}', 'admin_rallye_purged', $content);
 
                        // Purge whole rallye
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
@@ -931,7 +931,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 
        if ($min_users > 0) {
                // Rallye ends when X members are totally in your exchange
-               $return = getMaskedMessage('RALLYE_END_USERS', $min_users);
+               $return = '{%message,RALLYE_END_USERS=' . $min_users . '%}';
        } // END - if
 
        // Return
@@ -945,7 +945,7 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
 
        if ($min_prices > 0) {
                // Rallye ends when X members are totally in your exchange
-               $return = getMaskedMessage('RALLYE_END_PRICES', $min_prices);
+               $return = '{%message,RALLYE_END_PRICES=' . $min_prices . '%}';
        } // END - if
 
        // Return
index 814a19b..035c56b 100644 (file)
@@ -198,7 +198,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
                                return;
                        } else {
                                // Already added!
-                               $message = getMaskedMessage('SPONSOR_ALREADY_FOUND', $postData['email']);
+                               $message = '{%message,SPONSOR_ALREADY_FOUND=' . $postData['email'] . '%}';
                                $ret = 'already';
                        }
 
@@ -229,7 +229,7 @@ function sponsorTranslateUserStatus ($status) {
                // Not found
                //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
-               $ret = getMaskedMessage('ACCOUNT_STATUS_UNKNOWN', $status);
+               $ret = '{%message,ACCOUNT_STATUS_UNKNOWN=' . $status . '%}';
        }
 
        // Return status
@@ -341,7 +341,7 @@ function addSponsorContent ($what) {
                loadIncludeOnce($INC);
        } else {
                // File not found
-               $GLOBALS['sponsor_output'] .= displayMessage(getMaskedMessage('SPONSOR_CONTENT_404', $what), true);
+               $GLOBALS['sponsor_output'] .= displayMessage('{%message,SPONSOR_CONTENT_404=' . $what . '%}', true);
        }
 
        // Return content
@@ -466,7 +466,7 @@ function saveSponsorData ($postData, $content) {
 
                default: // Unknown sponsor what value!
                        logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", getWhat()));
-                       $message = getMaskedMessage('SPONSOR_UNKNOWN_WHAT', getWhat());
+                       $message = '{--SPONSOR_UNKNOWN_WHAT--}';
                        $templ   = '';
                        $subj    = '';
                        break;
@@ -591,7 +591,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
                                $message = $messageArray['added'];
                        } else {
                                // Sponsor account not found???
-                               $message = getMaskedMessage('SPONSOR_EMAIL_404', postRequestParameter('email'));
+                               $message = '{%message,SPONSOR_EMAIL_404=' . postRequestParameter('email') . '%}';
                        }
 
                        // Free memory
@@ -602,10 +602,10 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
                        logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
                        if (!isAdmin()) {
                                // Message for testing admin
-                               $message = getMaskedMessage('ADMIN_SPONSOR_UNKNOWN_STATUS', $status);
+                               $message = '{%message,ADMIN_SPONSOR_UNKNOWN_STATUS=' . $status . '%}';
                        } else {
                                // Message for the guest
-                               $message = getMaskedMessage('SPONSOR_UNKNOWN_STATUS', $status);
+                               $message = '{%message,SPONSOR_UNKNOWN_STATUS=' . $status . '%}';
                        }
                        break;
        } // END - switch
index 3914994..bb4c68d 100644 (file)
@@ -665,7 +665,7 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
        // Is the subject line there?
        if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) {
                // Set default subject if following eval() wents wrong
-               $subject = getMaskedMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', strtoupper($messageType));
+               $subject = '{%message,ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT=' . strtoupper($messageType) . '%}';
        } // END - if
 
        // Translate some data if present
index 96355fa..e1daec9 100644 (file)
@@ -206,7 +206,7 @@ function outputAdvancedOverview (&$result_main) {
                                $content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
                        } // END - if
                } elseif (isExtensionActive('bonus')) {
-                       $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
+                       $content['purged_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}';
                } else {
                        $content['purged_bonus_mails'] = '<span class="notice">{--ADMIN_EXTENSION_BONUS_404--}</span>';
                }
@@ -226,7 +226,7 @@ function outputAdvancedOverview (&$result_main) {
                        $content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
                } // END - if
        } elseif (isExtensionActive('bonus')) {
-               $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
+               $content['send_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}';
        } else {
                $content['send_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
        }
index 7c23a24..f1d1f1c 100644 (file)
@@ -689,7 +689,7 @@ function doResendUserConfirmationLink ($email) {
 // This is different to translateUserStatus() in text messages.
 function getConfirmationMessageFromUserStatus ($status) {
        // Default is 'UNKNOWN'
-       $message = getMaskedMessage('GUEST_LOGIN_ID_UNKNOWN_STATUS', $status);
+       $message = '{%message,GUEST_LOGIN_ID_UNKNOWN_STATUS=' . $status . '%}';
 
        // Which status is it?
        switch ($status) {
index 3419416..db99fbd 100644 (file)
@@ -53,7 +53,7 @@ function GET_WERNIS_ERROR_MESSAGE () {
                return $GLOBALS['wernis_data']['message'];
        } elseif (isset($GLOBALS['wernis_data']['status'])) {
                // Fall-back to status
-               return getMaskedMessage('WERNIS_ERROR_STATUS', $GLOBALS['wernis_data']['status']);
+               return '{%message,WERNIS_ERROR_STATUS=' . $GLOBALS['wernis_data']['status'] . '%}';
        } else {
                // Something bad happend
                return '{--WERNIS_UNKNOWN_ERROR--}';
@@ -115,7 +115,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                // Something bad happend... :(
                return array(
                        'status'  => 'request_error',
-                       'message' => getMaskedMessage('WERNIS_API_REQUEST_ERROR', $response[0])
+                       'message' => '{%message,WERNIS_API_REQUEST_ERROR=' . $response[0] . '%}'
                );
        } // END - if
 
@@ -193,7 +193,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown error %s from WDS66 API received.", $data[1]));
                                $return = array(
                                        'status'  => 'request_failed',
-                                       'message' => getMaskedMessage('WERNIS_API_REQUEST_FAILED', $data[1])
+                                       'message' => '{%message,WERNIS_API_REQUEST_FAILED=' . $data[1] . '%}'
                                );
                                break;
                }
@@ -317,7 +317,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
 // Translate the status IN/OUT
 function translateWernisTransferStatus ($status) {
        // Default status
-       $return = getMaskedMessage('WERNIS_STATUS_UNKNWOWN', $status);
+       $return = '{%message,WERNIS_STATUS_UNKNWOWN=' . $status . '%}';
 
        // Which status?
        switch ($status) {
index 781301e..ad6cc2a 100644 (file)
@@ -79,7 +79,7 @@ function getModuleTitle ($module) {
                // Is it 'error'?
                if ($module == 'error') {
                        // Error (real module was not found)
-                       $data['title'] = getMessage('MODULE_ERROR_404');
+                       $data['title'] = '{--MODULE_ERROR_404--}';
                }  else {
                        // No name found
                        $data['title'] = '{%message,UNKNOWN_MODULE_DETECTED_TITLE=' . $module . '%}';
index f0c295e..d2b5e4c 100644 (file)
@@ -267,7 +267,7 @@ if (!isAdminRegistered()) {
 
                        case '404': // Administrator login not found
                                setPostRequestParameter('ok', $ret);
-                               $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login'));
+                               $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestParameter('login') . '%}';
                                destroyAdminSession();
                                break;
 
@@ -417,7 +417,7 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       displayMessage(getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
+                       displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
                        destroyAdminSession();
                        break;
 
index ebea4f2..70ea1ef 100644 (file)
@@ -1295,11 +1295,11 @@ function generateAdminLink ($adminId) {
                                $adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
                        } else {
                                // Extension not found
-                               $adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
+                               $adminLink = '{%message,ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED=admins%}';
                        }
                } else {
                        // Maybe deleted?
-                       $adminLink = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+                       $adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
                }
        } // END - if
 
@@ -1500,7 +1500,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
                        default: // Unexpected action
                                logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                               displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+                               displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
                                break;
                } // END - switch
        } // END - foreach
index b8ed407..6665a4a 100644 (file)
@@ -205,7 +205,7 @@ LIMIT 1",
                                                // Is this non-productive?
                                                if (isExtensionProductive() === false) {
                                                        // Issue warning
-                                                       $taskData['text'] = displayMessage(getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name), true) . $taskData['text'];
+                                                       $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=', $ext_name . '%}', true) . $taskData['text'];
                                                } // END - if
 
                                                // Set current extension name
@@ -310,7 +310,7 @@ LIMIT 1",
                                                switch ($mode) {
                                                        default: // @TODO Unknown support mode
                                                        logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
-                                                       $OUT .= '<div class="notice medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
+                                                       $OUT .= '<div class="notice medium">{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}</div>';
                                                        break;
                                                } // END - switch
                                                break;
index 738f9d0..b1fb334 100644 (file)
@@ -181,9 +181,9 @@ LIMIT 1",
 
                default: // Unexpected action
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                       displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+                       displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
                        break;
-       }
+       } // END - switch
 } else {
        // Handle weightning
        doAdminProcessMenuWeightning('admin', $AND);
@@ -197,7 +197,8 @@ LIMIT 1",
                $content['sub'] = $SUB;
 
                // Init variables
-               $OUT = ''; $count = '0';
+               $OUT = '';
+               $count = '0';
 
                // Process all entries
                while ($data = SQL_FETCHARRAY($result)) {
index 4001380..770725d 100644 (file)
@@ -101,7 +101,7 @@ if (isFormSent('add')) {
                        } // END - switch
                } else {
                        // Entry not saved
-                       $TEXT .= getMaskedMessage('ADMIN_CATEGORY_NOT_SAVED', $id);
+                       $TEXT .= '{%message,ADMIN_CATEGORY_NOT_SAVED=' . $id . '%}';
                }
        } // END - foreach
 
index 4307aa3..9e69dc1 100644 (file)
@@ -59,7 +59,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Output message for updated entries
-       displayMessage(getMaskedMessage('ADMIN_REGISTER_CHANGES_SAVED', $count));
+       displayMessage('{%message,ADMIN_REGISTER_CHANGES_SAVED=' . $count . '%}');
 } // END - if
 
 // List all register values
index 0293640..f23808f 100644 (file)
@@ -115,18 +115,14 @@ LIMIT 1",
                                // Output message
                                if (getConfig('repay_deleted_mails') == 'REPAY') {
                                        // Repayed
-                                       displayMessage(getMaskedMessage('ADMIN_POINTS_REPAYED',
-                                               '{%pipe,translateComma=' . $totalPoints . '%}'
-                                       ));
+                                       displayMessage('{%message,ADMIN_POINTS_REPAYED=' . $totalPoints . '%}');
                                } else {
                                        // To jackpot
-                                       displayMessage(getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
-                                               '{%pipe,translateComma=' . $totalPoints . '%}'
-                                       ));
+                                       displayMessage('{%message,ADMIN_POINTS_TO_JACKPOT=' . $totalPoints . '%}');
                                }
                        } else {
                                // Points shredded!
-                               displayMessage(getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}'));
+                               displayMessage('{%message,ADMIN_POINTS_SHREDDED=' . $totalPoints . '%}');
                        }
 
                        // Remove links from DB
@@ -147,7 +143,7 @@ LIMIT 1",
                $count += SQL_AFFECTEDROWS();
 
                // Output link for manually removing stats entry
-               outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $count));
+               outputHtml('{%message,ADMIN_DELETED_MAILS_COUNT=' . $count . '%}');
        } else {
                // Mail already deleted!
                displayMessage('{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
index 2c8ae73..04ab29e 100644 (file)
@@ -77,8 +77,8 @@ WHERE
 LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Prepare loaded data for the
-                       $content['holiday_start'] = generateDateTime($content['holiday_start'], 3);
-                       $content['holiday_end']   = generateDateTime($content['holiday_end']  , 3);
+                       $content['holiday_start'] = generateDateTime($content['holiday_start'], '3');
+                       $content['holiday_end']   = generateDateTime($content['holiday_end']  , '3');
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_removed', $content, $content['userid']);
@@ -89,7 +89,9 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                // Free result
                SQL_FREERESULT($result);
        } // END - foreach
-       displayMessage(getMaskedMessage('ADMIN_HOLIDAY_MULTI_DELETE', $count));
+
+       // Display final message
+       displayMessage('{%message,ADMIN_HOLIDAY_MULTI_DELETE=' . $count . '%}');
 } elseif (isGetRequestParameterSet('userid')) {
        // Set default message
        $message = '{--ADMIN_HOLIDAY_SINGLE_404--}';
index 14035c9..a37f7d7 100644 (file)
@@ -69,7 +69,7 @@ if (isGetRequestParameterSet('id')) {
                                array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                        // Output message
-                       displayMessage(getMaskedMessage('ADMIN_SPONSOR_DELETED', bigintval(getRequestParameter('id'))));
+                       displayMessage('{%message,ADMIN_SPONSOR_DELETED=' . bigintval(getRequestParameter('id')) . '%}');
                } elseif (isPostRequestParameterSet('no')) {
                        // Do not delete him...
                        redirectToUrl('modules.php?module=admin&amp;what=list_sponsor&amp;id='.bigintval(getRequestParameter('id')));
@@ -85,7 +85,7 @@ if (isGetRequestParameterSet('id')) {
                }
        } else {
                // Sponsor not found
-               displayMessage(getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
+               displayMessage('{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestParameter('id')) . '%}');
        }
 
        // Free result
index d22020f..17b73bf 100644 (file)
@@ -147,7 +147,7 @@ LIMIT 1",
 
                                default: // Unknown mode
                                        logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mode %s detected.", getRequestParameter('mode')));
-                                       $message = getMaskedMessage('ADMIN_SPONSOR_INVALID_MODE', getRequestParameter('mode'));
+                                       $message = '{%message,ADMIN_SPONSOR_INVALID_MODE=' . getRequestParameter('mode') . '%}';
                                        break;
                        }
 
@@ -163,11 +163,11 @@ LIMIT 1",
                        loadTemplate($TPL, false, $content);
                } else {
                        // Template not found
-                       displayMessage(getMaskedMessage('ADMIN_SPONSOR_MODUS_TPL_404', getRequestParameter('mode')));
+                       displayMessage('{%message,ADMIN_SPONSOR_MODUS_TPL_404', getRequestParameter('mode') . '%}');
                }
        } else {
                // Sponsor not found
-               displayMessage(getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
+               displayMessage('{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestParameter('id')) . '%}');
        }
 
        // Free result
index 6774b62..5e12963 100644 (file)
@@ -58,7 +58,7 @@ if (isGetRequestParameterSet('reg_ext')) {
                // Shall we keep the extension always active?
                if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($ext_active == 'Y')) {
                        // Keep this extension active!
-                       displayMessage(getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id)));
+                       displayMessage('{%message,ADMIN_EXTENSION_ALWAYS_ACTIVE=' . $ext_id . '%}');
                } else {
                        // Deactivation is default
                        $active = 'N';
@@ -241,7 +241,7 @@ if (isGetRequestParameterSet('reg_ext')) {
        $do = 'demo';
 } elseif (isGetRequestParameterSet('registered')) {
        // Extensions changed
-       displayMessage(getMaskedMessage('ADMIN_EXTENSION_REGISTERED', getExtensionName(getRequestParameter('registered'))));
+       displayMessage('{%message,ADMIN_EXTENSION_REGISTERED=' . getExtensionName(getRequestParameter('registered')) . '%}');
 
        // Show next link
        if (isExtensionActive('task')) {
@@ -257,13 +257,13 @@ if (isGetRequestParameterSet('reg_ext')) {
        }
 } elseif (isGetRequestParameterSet('changed')) {
        // Extensions changed
-       displayMessage(getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed'))));
+       displayMessage('{%message,ADMIN_EXTENSION_CHANGED=' . bigintval(getRequestParameter('changed')) . '%}');
 } elseif (isGetRequestParameterSet('edited')) {
        // Extensions changed
-       displayMessage(getMaskedMessage('ADMIN_EXTENSION_EDITED', bigintval(getRequestParameter('edited'))));
+       displayMessage('{%message,ADMIN_EXTENSION_EDITED=' . bigintval(getRequestParameter('edited')) . '%}');
 } elseif (isGetRequestParameterSet('removed')) {
        // Extensions changed
-       displayMessage(getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', bigintval(getRequestParameter('removed'))));
+       displayMessage('{%message,ADMIN_EXTENSIONS_REMOVED=' . bigintval(getRequestParameter('removed')) . '%}');
 }
 
 // Shall we display active/inactive extensions?
@@ -364,7 +364,7 @@ ORDER BY
                                                        redirectToUrl('modules.php?module=admin&amp;what=extensions&amp;registered=' . getExtensionId($ext_name));
                                                } else {
                                                        // Errors detected!
-                                                       displayMessage(getMaskedMessage('ADMIN_EXTENSION_NOT_REGISTERED', $ext_name));
+                                                       displayMessage('{%message,ADMIN_EXTENSION_NOT_REGISTERED=' . $ext_name . '%}');
                                                }
 
                                                // Do we need to update cache file?
@@ -381,7 +381,7 @@ ORDER BY
                                                displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_ALREADY--}');
                                        } else {
                                                // Notify the admin that we have a problem here...
-                                               displayMessage(getMaskedMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_404', $ext_name));
+                                               displayMessage('{%message,ADMIN_EXTENSION_REGISTRATION_FAILED_404=' . $ext_name . '%}');
                                        }
                                } else {
                                        // Motify the admin that we have a problem here...
index dc82716..2dffa04 100644 (file)
@@ -97,7 +97,7 @@ if (isGetRequestParameterSet('userid')) {
                }
        } else {
                // User not found
-               displayMessage(getMaskedMessage('ADMIN_MEMBER_404', $content['userid']));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . $content['userid'] . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed
index 39ed75b..0539748 100644 (file)
@@ -58,13 +58,13 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                ), __FILE__, __LINE__);
 
                // Country added
-               $message = getMaskedMessage('ADMIN_COUNTRY_ADDED', strtoupper(postRequestParameter('descr')));
+               $message = '{%message,ADMIN_COUNTRY_ADDED=' . strtoupper(postRequestParameter('descr')) . '%}';
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Does already exist
-               $message = getMaskedMessage('ADMIN_COUNTRY_ALREADY', strtoupper(postRequestParameter('code')));
+               $message = '{%message,ADMIN_COUNTRY_ALREADY=' . strtoupper(postRequestParameter('code')) . '%}';
        }
 
        // Display message
index 367c945..bd642d7 100644 (file)
@@ -160,11 +160,11 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       displayMessage(getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+                       displayMessage('{%message,ADMIN_MEMBER_LINKS=' . bigintval(getRequestParameter('userid')) . '%}');
                }
        } else {
                // User not found
-               displayMessage(getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed
index c83030e..b33d521 100644 (file)
@@ -123,7 +123,7 @@ ORDER BY
                loadTemplate('admin_list_network_api_translation', false, $OUT);
        } else {
                // No entries found
-               displayMessage(getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_404', $networkData['network_title']));
+               displayMessage('{%message,ADMIN_NETWORK_API_TRANSLATION_404=' . $networkData['network_title'] . '%}');
        }
 
        // Free result
index 99b2f1e..0e6fc60 100644 (file)
@@ -121,7 +121,7 @@ ORDER BY
                loadTemplate('admin_list_network_params', false, $OUT);
        } else {
                // No entries found
-               displayMessage(getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_404', $networkData['network_title']));
+               displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_404=' . $networkData['network_title'] . '%}');
        }
 
        // Free result
index 65580e0..436063c 100644 (file)
@@ -99,7 +99,7 @@ ORDER BY
                loadTemplate('admin_list_network_types', false, $OUT);
        } else {
                // No entries found
-               displayMessage(getMaskedMessage('ADMIN_NETWORK_TYPES_404', $networkData['network_title']));
+               displayMessage('{%message,ADMIN_NETWORK_TYPES_404=' . $networkData['network_title'] . '%}');
        }
 
        // Free result
index 0be210c..6ec64e0 100644 (file)
@@ -192,7 +192,7 @@ ORDER BY
                SQL_FREERESULT($result_levels);
        } else {
                // User not found
-               displayMessage(getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . getRequestParameter('userid') . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed
index 713c121..47afe05 100644 (file)
@@ -85,7 +85,7 @@ WHERE
                loadTemplate('admin_list_sponsor_details', false, $content);
        } else {
                // Sponsor not found
-               displayMessage(getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
+               displayMessage('{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestParameter('id')) . '%}');
        }
 
        // Free result
@@ -123,7 +123,7 @@ ORDER BY
                }
        } else {
                // Sponsor not found
-               displayMessage(getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('refid'))));
+               displayMessage('{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestParameter('refid')) . '%}');
        }
 } else {
        // List all sponsors
index 4efd831..032b8ae 100644 (file)
@@ -124,10 +124,10 @@ if (isFormSent('add')) {
                        ), __FILE__, __LINE__);
 
                // Payment type added!
-               $message = getMaskedMessage('ADMIN_SPONSOR_PAYTYPE_ADDED', postRequestParameter('pay_name'));
+               $message = '{%message,ADMIN_SPONSOR_PAYTYPE_ADDED=' . postRequestParameter('pay_name') . '%}';
        } else {
                // Entry does already exists
-               $message = getMaskedMessage('ADMIN_SPONSOR_PAYTYPE_ALREADY', postRequestParameter('pay_name'));
+               $message = '{%message,ADMIN_SPONSOR_PAYTYPE_ALREADY=' . postRequestParameter('pay_name') . '%}';
        }
 
        // Free memory
index 89e2a39..d0ec15b 100644 (file)
@@ -53,7 +53,7 @@ if (isGetRequestParameterSet('id')) {
                SQL_FREERESULT($result);
        } else {
                // Sponsor not found
-               displayMessage(getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
+               displayMessage('{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestParameter('id')) . '%}');
        }
 } else {
        // Not called by what-list_sponsor.php
index 16fce75..c2194ec 100644 (file)
@@ -78,7 +78,7 @@ switch (getRequestParameter('type')) {
 
        default: // Unknown type
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestParameter('type')));
-               displayMessage(getMaskedMessage('ADMIN_TASK_UNKNOWN_MODE', getRequestParameter('type')));
+               displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestParameter('type') . '%}');
                break;
 } // END - switch
 
index 1ca24d5..5add439 100644 (file)
@@ -196,10 +196,10 @@ LIMIT %s",
                // Data in pool or in user_stats not found, so let's find out where data is missing
                if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', true) == 1) {
                        // pool table
-                       displayMessage(getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
+                       displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');
                } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 1) {
                        // user_stats table
-                       displayMessage(getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID));
+                       displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
                } else {
                        // both or link is invalid
                        displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
index 2d6592c..70120a8 100644 (file)
@@ -189,7 +189,7 @@ LIMIT 1",
                loadTemplate('admin_user_details', false, $content);
        } else {
                // Account does not exist!
-               displayMessage(getMaskedMessage('ADMIN_MEMBER_404', $userid));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}');
        }
 
        // Free the result
index 44fa061..64e47ca 100644 (file)
@@ -118,7 +118,7 @@ foreach ($result as $entry) {
                        } // END - if
 
                        // Add reload lock
-                       $entry['already'] = getMaskedMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN', $countdown);
+                       $entry['already'] = '{%message,ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN=' . $countdown . '%}';
                } else {
                        // Never resentable unless manual removal
                        $entry['already'] = '{--ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED--}';
index ed5d9ea..ca5e316 100644 (file)
@@ -107,7 +107,7 @@ if (isGetRequestParameterSet('id')) {
                }
        } else {
                // Sponsor not found
-               $message = getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id')));
+               $message = '{%message,ADMIN_SPONSOR_404=' . bigintval(getRequestParameter('id')) . '%}';
        }
 
        // Free result
index 4356f79..d5ca361 100644 (file)
@@ -73,7 +73,7 @@ if (isGetRequestParameterSet('userid')) {
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('ADMIN_USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
+                       $message = '{%message,ADMIN_USER_ACCOUNT_LOCKED=' . bigintval(getRequestParameter('userid')) . '%}';
                        $isActive = true;
                } elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
@@ -108,7 +108,7 @@ LIMIT 1",
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('ADMIN_USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
+                       $message = '{%message,ADMIN_USER_ACCOUNT_UNLOCKED=' . bigintval(getRequestParameter('userid')) . '%}';
                        $isActive = true;
                } elseif (isFormSent('delete')) {
                        // Delete the account
@@ -127,20 +127,20 @@ LIMIT 1",
                                switch (getUserData('status')) {
                                        case 'CONFIRMED': // Yes, lock him down... ;-)
                                                $content['ok']     = 'lock';
-                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_LOCK_ACCOUNT', $content['userid']);
-                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_LOCK_ACCOUNT', $content['userid']);
+                                               $content['header'] = '{%message,ADMIN_HEADER_LOCK_ACCOUNT=' . $content['userid'] . '%}';
+                                               $content['text']   = '{%message,ADMIN_TEXT_LOCK_ACCOUNT=' . $content['userid'] . '%}';
                                                break;
 
                                        case 'LOCKED': // Unlock the user
                                                $content['ok']     = 'unlock';
-                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_UNLOCK_ACCOUNT', $content['userid']);
-                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_UNLOCK_ACCOUNT', $content['userid']);
+                                               $content['header'] = '{%message,ADMIN_HEADER_UNLOCK_ACCOUNT=' . $content['userid'] . '%}';
+                                               $content['text']   = '{%message,ADMIN_TEXT_UNLOCK_ACCOUNT=' . $content['userid'] . '%}';
                                                break;
 
                                        case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked!
-                                               $content['ok'] = 'delete';
-                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_DELETE_ACCOUNT', $content['userid']);
-                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_DELETE_ACCOUNT', $content['userid']);
+                                               $content['ok']     = 'delete';
+                                               $content['header'] = '{%message,ADMIN_HEADER_DELETE_ACCOUNT=' . $content['userid'] . '%}';
+                                               $content['text']   = '{%message,ADMIN_TEXT_DELETE_ACCOUNT=' . $content['userid'] . '%}';
                                                break;
                                }
 
index 285e3ce..93e2d1c 100644 (file)
@@ -74,7 +74,7 @@ if (isGetRequestParameterSet('access')) {
                        clearOutputBuffer();
                } else {
                        // Output message
-                       displayMessage(getMaskedMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT', $access));
+                       displayMessage('{%message,ADMIN_UNKNOWN_LOGFILE_FORMAT=' . $access . '%}');
                        return;
                }
 
@@ -83,7 +83,7 @@ if (isGetRequestParameterSet('access')) {
                shutdown();
        } else {
                // Not readable!
-               displayMessage(getMaskedMessage('LOGFILE_NOT_READABLE', $access));
+               displayMessage('{%message,LOGFILE_NOT_READABLE=' . $access . '%}');
        }
 } else {
        // Is the directory there?
index 6003db9..04be662 100644 (file)
@@ -70,7 +70,7 @@ if (getAction() == 'login') {
 // Are we in 'welcome' page and are there jobs to be done?
 if (!ifAdminMenuHasEntries(getAction())) {
        // This menu is empty and so no content is displayed
-       displayMessage(getMaskedMessage('ADMIN_MENU_IS_EMPTY', getAction()));
+       displayMessage('{--ADMIN_MENU_IS_EMPTY--}');
 } elseif ($jobsDone === true) {
        // Generate overview of all main menus
        if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
@@ -92,7 +92,7 @@ if (!ifAdminMenuHasEntries(getAction())) {
 } elseif ($taskExt === false) {
        if (isExtensionActive('task')) {
                // Output warning message
-               displayMessage(getMaskedMessage('EXTENSION_WARNING_EXTENSION_INACTIVE', 'task'));
+               displayMessage('{%message,EXTENSION_WARNING_EXTENSION_INACTIVE=task%}');
        } // END - if
 
        // List selected tasks on overview when task management is not active
index 793ca9f..d11699f 100644 (file)
@@ -82,7 +82,7 @@ foreach ($actions as $action) {
 
 // Repair finished
 if ($repairedWeights > 0) {
-       $message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $repairedWeights);
+       $message = '{%message,ADMIN_REPAIR_ENTRIES_FIXED=' . $repairedWeights . '%}';
 } else {
        $message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
 }
index e0293f6..0714353 100644 (file)
@@ -62,7 +62,7 @@ if (!SQL_HASZERONUMS($result)) {
 
        if ($REMOVED > 0) {
                // Entries repaired
-               $content = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $REMOVED);
+               $content = '{%message,ADMIN_REPAIR_ENTRIES_FIXED=' . $REMOVED . '%}';
        } else {
                // Nothing repaired
                $content = '<div class="notice">{--ADMIN_REPAIR_NOTHING_FIXED--}</div>';
index af75341..23bdf1d 100644 (file)
@@ -84,7 +84,7 @@ foreach ($actions as $action) {
 
 // Repair finished
 if ($repairedWeights > 0) {
-       $message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $repairedWeights);
+       $message = '{%message,ADMIN_REPAIR_ENTRIES_FIXED=' . $repairedWeights . '%}';
 } else {
        $message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
 }
index 3efb04b..becfe0a 100644 (file)
@@ -82,7 +82,7 @@ foreach ($actions as $action) {
 
 // Repair finished
 if ($repairedWeights > 0) {
-       $message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $repairedWeights);
+       $message = '{%message,ADMIN_REPAIR_ENTRIES_FIXED=' . $repairedWeights . '%}';
 } else {
        $message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
 }
index 0d6ad90..2208230 100644 (file)
@@ -76,14 +76,14 @@ VALUES ('%s','N','%s','%s')",
                        rebuildCache('themes', 'them');
 
                        // Prepare message
-                       $message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme'));
+                       $message = '{%message,ADMIN_THEME_IMPORTED=' . postRequestParameter('theme') . '%}';
                } else {
                        // Include file not found
-                       $message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestParameter('theme'));
+                       $message = '{%message,ADMIN_THEME_INC_404=' . postRequestParameter('theme') . '%}';
                }
        } else {
                // Theme already imported
-               $message = getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', postRequestParameter('theme'));
+               $message = '{%message,ADMIN_THEME_ALREADY_INSTALLED=' . postRequestParameter('theme') . '%}';
        }
 
        // Output message
@@ -127,7 +127,7 @@ array_pk_sort($THEMES, array('theme_name'));
 $OUT = '';
 foreach ($THEMES['theme_unix'] as $key => $unix) {
        // Already installed is default
-       $formContent = '<div class="notice">' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '</div>';
+       $formContent = '<div class="notice">{%message,ADMIN_THEME_ALREADY_INSTALLED=' . $unix . '%}</div>';
 
        // Check if current theme is already imported or not
        if (!ifThemeExists($unix)) {
index b70f6b7..d83df3b 100644 (file)
@@ -124,7 +124,7 @@ ORDER BY
                                SQL_FREERESULT($result);
                        } else {
                                // Not found
-                               displayMessage(getMaskedMessage('ADMIN_SPONSOR_ACCOUNT_404_ALREADY_CONFIRMED', $content['id']));
+                               displayMessage('{%message,ADMIN_SPONSOR_ACCOUNT_404_ALREADY_CONFIRMED=' . $content['id'] . '%}');
                                return;
                        }
 
index 36c68ab..6e9e43f 100644 (file)
@@ -72,7 +72,7 @@ if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('user
                }
        } else {
                // Not found?
-               displayMessage(getMaskedMessage('ADMIN_USER_ACCOUNT_404', bigintval(getRequestParameter('userid'))));
+               displayMessage('{%message,ADMIN_USER_ACCOUNT_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Display selection box
index c8c30db..577b030 100644 (file)
@@ -72,7 +72,7 @@ if ($content['user_count'] > 0) {
 $TEST = makeTime(0, 0, 0, $PROJECTED);
 
 if ($TEST > time()) {
-       $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', generateDateTime($PROJECTED, 3));
+       $content['projected'] = '{%message,USER_MT_PROJECTED=' . generateDateTime($PROJECTED, '3') . '%}';
 } else {
        $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', '{--USER_PROJECTION_UNKNOWN--}');
 }
index f6c5986..1f09c0a 100644 (file)
@@ -141,7 +141,7 @@ LIMIT 1",
                }
        } else {
                // No sponsor found
-               displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_404', getRequestParameter('hash')));
+               displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getRequestParameter('hash') . '%}');
        }
 
        // Free memory
index 1a63224..ebc427f 100644 (file)
@@ -135,7 +135,7 @@ LIMIT 1",
                        sendAdminNotification('{--ADMIN_COUPON_CASHED_SUBJECT--}', 'admin_coupon_cashed', $content, getMemberId());
 
                        // Display message
-                       displayMessage(getMaskedMessage('MEMBER_COUPON_CODE_CASHED', $content['points']));
+                       displayMessage('{%message,MEMBER_COUPON_CODE_CASHED=' . $content['points'] . '%}');
                } else {
                        // No coupon found
                        displayMessage('{--MEMBER_COUPON_CODE_ALREADY_CASHED--}');
index 46baf1c..2583ca3 100644 (file)
@@ -98,7 +98,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
                }
 
                // Display message and exit here
-               displayMessage(getMaskedMessage('MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, 1)));
+               displayMessage('{%message,MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, '1') . '%}');
                return;
        }
 } // END - if
@@ -225,7 +225,7 @@ LIMIT 1",
                }
        } else {
                // User not found
-               displayMessage(getMaskedMessage('MEMBER_HOLIDAY_NOT_STOPPED_404', getMemberId()));
+               displayMessage('{--MEMBER_HOLIDAY_NOT_STOPPED_404--}');
        }
 
        // Free result
index 4b9f858..4e958f7 100644 (file)
@@ -73,7 +73,7 @@ switch ($mode) {
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account
-                       $content['change'] = displayMessage('<div class="notice">' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getProfileLock(), 0)) . '</div>', true);
+                       $content['change'] = displayMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>', true);
                } else {
                        // He is allowed to change his profile
                        $content['change'] = loadTemplate('member_mydata_button', true);
@@ -127,7 +127,7 @@ LIMIT 1",
 
                // How far is last change on his profile away from now?
                if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
-                       $content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getProfileLock(), 0));
+                       $content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}';
 
                        // You cannot change your account
                        displayMessage($content['update_check']);
index eb627aa..ca079da 100644 (file)
@@ -114,7 +114,7 @@ if (getRequestParameter('mode') == 'pay') {
        $content['points'] = $points;
 } else {
        // Invalid mode!
-       displayMessage(getMaskedMessage('MEMBER_PRIMERA_MODE_INVALID', getRequestParameter('mode')));
+       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestParameter('mode') . '%}');
        return;
 }
 
@@ -170,14 +170,14 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                        displayMessage(GET_PRIMERA_ERROR_MESSAGE());
                                } else {
                                        // Something went wrong
-                                       displayMessage(getMaskedMessage('MEMBER_PRIMERA_PAYOUT_FAILED', GET_PRIMERA_ERROR_MESSAGE()));
+                                       displayMessage('{%message,MEMBER_PRIMERA_PAYOUT_FAILED=' . GET_PRIMERA_ERROR_MESSAGE() . '%}');
                                }
                        }
                        break;
 
                default: // Invalid mode!
                        logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode')));
-                       displayMessage(getMaskedMessage('MEMBER_PRIMERA_MODE_INVALID', getRequestParameter('mode')));
+                       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestParameter('mode') . '%}');
                        return;
        }
 } // END - if
index cf67b29..ee2afa4 100644 (file)
@@ -75,14 +75,14 @@ if ((isFormSent('edit')) && (isPostRequestParameterSet('id'))) {
                                displayMessage('{--MEMBER_REFBACK_DONE--}');
                        } elseif (isset($status['message'])) {
                                // Something went wrong with error message
-                               displayMessage(getMaskedMessage('MEMBER_REFBACK_ERROR_MESSAGE', $status['message']));
+                               displayMessage('{%message,MEMBER_REFBACK_ERROR_MESSAGE=' . $status['message'] . '%}');
                        } else {
                                // No message found
                                displayMessage('{--MEMBER_REFBACK_ERROR_EMPTY_MESSAGE--}');
                        }
                } else {
                        // Percents out-of-bounds ;-)
-                       displayMessage(getMaskedMessage('MEMBER_REFBACK_ERROR_OUT_OF_BOUNDS'));
+                       displayMessage('{--MEMBER_REFBACK_ERROR_OUT_OF_BOUNDS--}');
                }
 
                // Insert line
index b535b08..49b6390 100644 (file)
@@ -517,7 +517,7 @@ LIMIT 1",
                if (SQL_NUMROWS($result) == 1) {
                        // Load newest transaction
                        list($newest) = SQL_FETCHROW($result);
-                       $content['settings'] = getMaskedMessage('TRANSFER_LATEST_IS', generateDateTime($newest, 3));
+                       $content['settings'] = '{%message,TRANSFER_LATEST_IS=' . generateDateTime($newest, '3') . '%}';
                } else {
                        // Load template
                        $content['settings'] = loadTemplate('member_transfer_settings', true, $content);
index 5505c9d..7511489 100644 (file)
@@ -63,14 +63,12 @@ LIMIT 1",
        // Translate some data
        $content['timestamp']   = generateDateTime($content['timestamp'], 2);
        $content['userid']      = getMemberId();
-       $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN', $content['id']);
+       $content['user_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
        // Is ext-user installed?
        if (isExtensionInstalled('user')) {
                // Get timestamp from insert
-               $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON',
-                       generateDateTime(getEpocheTimeFromUserStats('bonusid', $content['id']), 2)
-               );
+               $content['user_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('bonusid', $content['id']), '2') . '%}';
        } // END - if
 
        // Display it depending on mail (data) type
@@ -102,16 +100,14 @@ LIMIT 1",
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $content['timestamp']   = generateDateTime($content['timestamp'], 2);
+       $content['timestamp']   = generateDateTime($content['timestamp'], '2');
        $content['userid']      = getMemberId();
-       $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
+       $content['user_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
        // Is ext-user installed?
        if (isExtensionInstalled('user')) {
                // Get timestamp from insert
-               $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON',
-                       generateDateTime(getEpocheTimeFromUserStats('mailid', $content['id']), 2)
-               );
+               $content['user_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('mailid', $content['id']), '2') . '%}';
        } // END - if
 
        // Display it depending on mail (data) type
index bac90e4..af105f7 100644 (file)
@@ -141,7 +141,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
        $content['wernis_userid'] = getUserData('wernis_userid');
 } else {
        // Invalid mode!
-       displayMessage(getMaskedMessage('MEMBER_WERNIS_MODE_INVALID', getRequestParameter('mode')));
+       displayMessage('{%message,MEMBER_WERNIS_MODE_INVALID=' . getRequestParameter('mode') . '%}');
        return;
 }
 
@@ -189,7 +189,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                                displayMessage(GET_WERNIS_ERROR_MESSAGE());
                                        } else {
                                                // Something went wrong
-                                               displayMessage(getMaskedMessage('MEMBER_WERNIS_WITHDRAW_FAILED', GET_WERNIS_ERROR_MESSAGE()));
+                                               displayMessage('{--MEMBER_WERNIS_WITHDRAW_FAILED--}');
                                        }
                                }
                                break;
@@ -220,14 +220,14 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                                displayMessage(GET_WERNIS_ERROR_MESSAGE());
                                        } else {
                                                // Something went wrong
-                                               displayMessage(getMaskedMessage('MEMBER_WERNIS_WITHDRAW_FAILED', GET_WERNIS_ERROR_MESSAGE()));
+                                               displayMessage('{--MEMBER_WERNIS_PAYOUT_FAILED--}');
                                        }
                                }
                                break;
 
                        default: // Invalid mode!
                                logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode')));
-                               displayMessage(getMaskedMessage('MEMBER_WERNIS_MODE_INVALID', getRequestParameter('mode')));
+                               displayMessage('{%message,MEMBER_WERNIS_MODE_INVALID=' . getRequestParameter('mode') . '%}');
                                return;
                } // END - switch
        }
index 6c3acd0..8e98ea2 100644 (file)
@@ -130,11 +130,11 @@ if (SQL_NUMROWS($result) == 1) {
        } else {
                // Locked or so?
                $STATUS = sponsorTranslateUserStatus($content['status']);
-               $GLOBALS['sponsor_output'] = displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS), true);
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $STATUS . '%}', true);
        }
 } else {
        // Sponsor account not found
-       $GLOBALS['sponsor_output'] = displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')), true);
+       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
 }
 
 // Free memory
index 8a4c76b..f71ee51 100644 (file)
@@ -116,11 +116,11 @@ if (SQL_NUMROWS($result) == 1) {
        } else {
                // Locked or so?
                $STATUS = sponsorTranslateUserStatus($content['status']);
-               $GLOBALS['sponsor_output'] = displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS), true);
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $STATUS . '%}', true);
        }
 } else {
        // Sponsor account not found
-       $GLOBALS['sponsor_output'] = displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')), true);
+       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
 }
 
 // Free memory
index 58564d9..9be8350 100644 (file)
@@ -1978,7 +1978,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
                                array(implode(',', $userids), count($userids)), __FUNCTION__, __LINE__);
                } else {
                        // Nothing deleted
-                       displayMessage(getMaskedMessage('ADMIN_MAIL_NOTHING_DELETED', $id));
+                       displayMessage('{%message,ADMIN_MAIL_NOTHING_DELETED=' . $id . '%}');
                }
        } // END - if
 
index f564b4c..4f4381e 100644 (file)
@@ -1260,7 +1260,7 @@ function generateExtensionOutdatedMessage ($ext_name, $ext_ver) {
        } // END - if
 
        // Default message
-       $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_OUTDATED', $ext_name);
+       $message = '{%message,EXTENSION_PROBLEM_EXTENSION_OUTDATED=' . $ext_name . '%}';
 
        // Is an admin logged in?
        if (isAdmin()) {
@@ -1281,12 +1281,12 @@ function generateExtensionInactiveMessage ($ext_name) {
        } // END - if
 
        // Default message
-       $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name);
+       $message = '{%message,EXTENSION_PROBLEM_EXTENSION_INACTIVE=' . $ext_name . '%}';
 
        // Is an admin logged in?
        if (isAdmin()) {
                // Then output admin message
-               $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name);
+               $message = '{%message,ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE=' . $ext_name . '%}';
        } // END - if
 
        // Return prepared message
@@ -1302,12 +1302,12 @@ function generateExtensionNotInstalledMessage ($ext_name) {
        } // END - if
 
        // Default message
-       $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
+       $message = '{%message,EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED=' . $ext_name . '%}';
 
        // Is an admin logged in?
        if (isAdmin()) {
                // Then output admin message
-               $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
+               $message = '{%message,ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED=' . $ext_name . '%}';
        } // END - if
 
        // Return prepared message