From 330dbb3e2b34450cd1665497506455e195a0a166 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 5 Jul 2011 03:50:45 +0000 Subject: [PATCH] Way more usage of EL code: - Way more EL code introduced by replacing direct calls in PHP scripts with EL code in templates - TODOs.txt updated --- DOCS/TODOs.txt | 6 +++--- birthday_confirm.php | 2 +- inc/classes/cachesystem.class.php | 7 +++---- inc/extensions-functions.php | 2 +- inc/functions.php | 4 ++-- inc/language/birthday_de.php | 2 +- inc/language/de.php | 10 +++++----- inc/language/holiday_de.php | 2 +- inc/language/primera_de.php | 1 + inc/language/sponsor_de.php | 2 +- inc/language/wernis_de.php | 3 ++- inc/libs/bonus_functions.php | 2 +- inc/libs/network_functions.php | 20 +++++++++---------- inc/libs/rallye_functions.php | 18 ++++++++--------- inc/libs/sponsor_functions.php | 14 ++++++------- inc/libs/surfbar_functions.php | 2 +- inc/libs/task_functions.php | 4 ++-- inc/libs/user_functions.php | 2 +- inc/libs/wernis_functions.php | 8 ++++---- inc/module-functions.php | 2 +- inc/modules/admin.php | 4 ++-- inc/modules/admin/admin-inc.php | 6 +++--- inc/modules/admin/overview-inc.php | 4 ++-- inc/modules/admin/what-adminedit.php | 7 ++++--- inc/modules/admin/what-config_cats.php | 2 +- inc/modules/admin/what-config_register.php | 2 +- inc/modules/admin/what-del_email.php | 12 ++++------- inc/modules/admin/what-del_holiday.php | 8 +++++--- inc/modules/admin/what-del_sponsor.php | 4 ++-- inc/modules/admin/what-edit_sponsor.php | 6 +++--- inc/modules/admin/what-extensions.php | 14 ++++++------- inc/modules/admin/what-list_cats.php | 2 +- inc/modules/admin/what-list_country.php | 4 ++-- inc/modules/admin/what-list_links.php | 4 ++-- .../what-list_network_api_translation.php | 2 +- .../admin/what-list_network_params.php | 2 +- inc/modules/admin/what-list_network_types.php | 2 +- inc/modules/admin/what-list_refs.php | 2 +- inc/modules/admin/what-list_sponsor.php | 4 ++-- inc/modules/admin/what-list_sponsor_pay.php | 4 ++-- inc/modules/admin/what-list_sponsor_pays.php | 2 +- inc/modules/admin/what-list_task.php | 2 +- inc/modules/admin/what-list_unconfirmed.php | 4 ++-- inc/modules/admin/what-list_user.php | 2 +- inc/modules/admin/what-list_yoomedia_tm.php | 2 +- inc/modules/admin/what-lock_sponsor.php | 2 +- inc/modules/admin/what-lock_user.php | 18 ++++++++--------- inc/modules/admin/what-logs.php | 4 ++-- inc/modules/admin/what-overview.php | 4 ++-- inc/modules/admin/what-repair_amnu.php | 2 +- inc/modules/admin/what-repair_cats.php | 2 +- inc/modules/admin/what-repair_gmnu.php | 2 +- inc/modules/admin/what-repair_mmnu.php | 2 +- inc/modules/admin/what-theme_import.php | 8 ++++---- inc/modules/admin/what-unlock_sponsor.php | 2 +- inc/modules/admin/what-user_contct.php | 2 +- inc/modules/guest/what-mediadata.php | 2 +- inc/modules/guest/what-sponsor_login.php | 2 +- inc/modules/member/what-cash_coupon.php | 2 +- inc/modules/member/what-holiday.php | 4 ++-- inc/modules/member/what-mydata.php | 4 ++-- inc/modules/member/what-primera.php | 6 +++--- inc/modules/member/what-refback.php | 4 ++-- inc/modules/member/what-transfer.php | 2 +- inc/modules/member/what-unconfirmed.php | 14 +++++-------- inc/modules/member/what-wernis.php | 8 ++++---- inc/modules/sponsor/account.php | 4 ++-- inc/modules/sponsor/settings.php | 4 ++-- inc/mysql-manager.php | 2 +- inc/template-functions.php | 10 +++++----- 70 files changed, 166 insertions(+), 170 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 2f29fb7158..d403b8ca83 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -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? @@ -178,8 +178,8 @@ ./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 diff --git a/birthday_confirm.php b/birthday_confirm.php index f95f1f144b..8619fc7056 100644 --- a/birthday_confirm.php +++ b/birthday_confirm.php @@ -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! diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index aaaebe6052..05e488a615 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -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__, '(' . __LINE__ . '): ' . 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__, '(' . __LINE__ . '): ' . 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__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED'); diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 430fd659b7..87744d1744 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -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", diff --git a/inc/functions.php b/inc/functions.php index 333de57fec..72bb5460e2 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -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); diff --git a/inc/language/birthday_de.php b/inc/language/birthday_de.php index 47d5d6db1b..64b81b9851 100644 --- a/inc/language/birthday_de.php +++ b/inc/language/birthday_de.php @@ -46,7 +46,7 @@ addMessages(array( 'ADMIN_CONFIG_BIRTHDAY_TITLE' => "Einstellungen zu Geburtstagsmails", 'ADMIN_CONFIG_BIRTHDAY_POINTS' => "{?POINTS?} als "Geburtstagsgeschenk"", 'ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE' => "Wert 0 deaktiviert die Extragutschrift.", - 'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: %s", + 'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: {%%pipe,translateUserStatus=%s%%}", 'MEMBER_BIRTHDAY_CANNOT_LOAD_DATA' => "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag.", 'ADMIN_CONFIG_SELECT_BIRTHDAY_MODE' => "Vergütungsmodus der {?POINTS?}", 'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?
(Nur in Verbindung mit der Erweiterung autopurge!)
", diff --git a/inc/language/de.php b/inc/language/de.php index a3ee4947a9..c59498b2b5 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -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 sql_patches installiert haben und dabei das Passort-Hashing geändert/verbessert wurde. Bitte erneut einloggen.", 'ADMIN_LOGOUT_SQL_PATCHES_REMOVE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung sql_patches entfernt haben. Bitte klicken Sie weiter, um jetzt das Passwort neu zu setzen.", - 'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied %s {?POINTS?} zurückgeschrieben.", - 'ADMIN_POINTS_TO_JACKPOT' => "Es wurden %s {?POINTS?} in den Jackpot gelegt.", + 'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied {%%pipe,translateComma=%s%%} {?POINTS?} zurückgeschrieben.", + 'ADMIN_POINTS_TO_JACKPOT' => "Es wurden {%%pipe,translateComma=%s%%} {?POINTS?} in den Jackpot gelegt.", 'ADMIN_NO_POINTS_REPAYED' => "Die Mailbuchung hatte keine {?POINTS?} zum zurückbuchen.", - 'ADMIN_POINTS_SHREDDED' => "Es wurden %s {?POINTS?} geschrettert.", + 'ADMIN_POINTS_SHREDDED' => "Es wurden {%%pipe,translateComma=%s%%} {?POINTS?} geschrettert.", 'ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Die Erweiterung %s ist derzeit deaktiviert. Hier können Sie diese aktivieren.", 'ADMIN_EXTENSION_PROBLEM_EXTENSION_OUTDATED' => "Die Erweiterung %s ist veraltet. Ihre Version: {%%ext,version=%s%%}, erwartete Version: %s.", 'ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Die Erweiterung %s ist derzeit nicht installiert. Hier können Sie diese aktivieren.", @@ -1057,7 +1057,7 @@ addMessages(array( 'FATAL_EXTENSION_LOADED' => "Erweiterung %s bereits geladen.", 'ADMIN_ACCESS_DENIED' => "Zugriff auf den Adminmenüpunkt %s nicht gestattet.", 'ADMIN_URL_BLACKLIST_DISABLED' => "URL-Sperrliste ist deaktiviert.", - 'ADMIN_MENU_IS_EMPTY' => "Das von Ihnen ausgewählte Menü %s ist leer.", + 'ADMIN_MENU_IS_EMPTY' => "Das von Ihnen ausgewählte Menü {%pipe,getAction%} ist leer.", 'ADMIN_EXTENSION_TEXT_FILE_MISSING' => "Die Erweiterung %s hat keinen Beschreibungstext. Bitte melden Sie dies uns im Bug-Tracker.", 'GUEST_STATS_NO_CLICKS' => "Keine Klicks in Ihrem {?mt_word?} verzeichnet.", 'ADMIN_EXTENSIONS_REMOVED' => "Es wurden %s Erweiterungen aus Ihrem {?mt_word?} entfernt.", @@ -1067,7 +1067,7 @@ addMessages(array( 'ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE' => "Die Erweiterung '%s' sollten Sie nur installieren, wenn Sie daran mitentwickeln wollen. Produktiv ist diese nicht einsatzbereit.", 'ADMIN_ENTRIES_404' => "Es wurden keine Einträge gefunden.", 'DEBUG_REPORT_BUG_SUBJECT' => "[BUG!] Es wurde ein Bug im Script erkannt:", - 'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung %s kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.", + 'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung {%%pipe,getExtensionName=%s%%} 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", diff --git a/inc/language/holiday_de.php b/inc/language/holiday_de.php index 461f3805d7..ce58b3ec55 100644 --- a/inc/language/holiday_de.php +++ b/inc/language/holiday_de.php @@ -78,7 +78,7 @@ addMessages(array( 'MEMBER_HOLIDAY_TIME_LOCK' => "Urlaubsschaltung eingerichtet", 'MEMBER_HOLIDAY_LOCKED' => "Sie können derzeit Ihre Urlaubsschaltung nicht wieder deaktivieren, da Sie diese erst vor Kurzem aktiviert haben.", 'MEMBER_HOLIDAY_ORDER' => "Sie können derzeit Ihre Urlaubsschaltung nicht verändern, da Ihre letzte Mailbuchung zu kurz her ist! Letzte Buchung: %s", - 'MEMBER_HOLIDAY_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Mitglieder-Id %s nicht gefunden.", + 'MEMBER_HOLIDAY_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Ihre Mitglieder-Id {%pipe,getMemberId%} wurde nicht gefunden.", // Subject lines // - Admin diff --git a/inc/language/primera_de.php b/inc/language/primera_de.php index 0dce9523f8..76b3218e25 100644 --- a/inc/language/primera_de.php +++ b/inc/language/primera_de.php @@ -114,6 +114,7 @@ addMessages(array( 'MEMBER_PRIMERA_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=primera_min_payout%} Primera an.", 'MEMBER_PRIMERA_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! Rückmeldung für den Support: %s.", 'MEMBER_PRIMERA_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)", + 'MEMBER_PRIMERA_PAYPOUT_FAILED' => "Die Auszahlung hat nicht geklappt! Rückmeldung für den Support: %s.", 'MEMBER_PRIMERA_PAYOUT_DONE' => "Auszahlung auf Primus-Portal erfolgreich abgeschlossen. :-)", 'MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED' => "Sie können nicht %s Primera auszahlen, da Sie nur %s übrig haben.", 'MEMBER_PRIMERA_STATUS' => "Überweisungsart", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index a7adaee835..19b3a8c119 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -293,7 +293,7 @@ addMessages(array( 'SPONSOR_ACCOUNT_DATA_SAVED' => "Ihre Daten wurden gespeichert.", 'SPONSOR_ACCOUNT_EMAIL_CHANGED' => "Sie haben Ihre EMail-Adresse geändert, Account wurde temporär gesperrt. Bitte [hier klicken], um in den Gastbereich zu gelangen.", 'SPONSOR_SETTINGS_HEADER' => "Einstellungen Ihres Sponsorenaccounts", - 'SPONSOR_UNKNOWN_WHAT' => "Scripte-Fehler: Unbekannte Sponsor-Aktion %s erkannt.", + 'SPONSOR_UNKNOWN_WHAT' => "Scripte-Fehler: Unbekannte Sponsor-Aktion {%pipe,getWhat%} erkannt.", 'SPONSOR_SETTINGS_SAVED' => "Neue Einstellungen gespeichert.", // Error messages diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php index 157b28698b..f48aa00677 100644 --- a/inc/language/wernis_de.php +++ b/inc/language/wernis_de.php @@ -125,8 +125,9 @@ addMessages(array( 'MEMBER_WERNIS_INVALID_AMOUNT' => "Bitte nur Zahlen für den zu überweisenden Betrag eingeben.", 'MEMBER_WERNIS_WITHDRAW_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=wernis_min_withdraw%} Wernis für die Einzahlung an.", 'MEMBER_WERNIS_PAYOUT_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=wernis_min_payout%} Wernis für die Auszahlung an.", - 'MEMBER_WERNIS_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! Rückmeldung für den Support: %s.", + 'MEMBER_WERNIS_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! Rückmeldung für den Support: {%pipe,GET_WERNIS_ERROR_MESSAGE%}.", 'MEMBER_WERNIS_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)", + 'MEMBER_WERNIS_PAYOUT_FAILED' => "Die Auszahlung hat nicht geklappt! Rückmeldung für den Support: {%pipe,GET_WERNIS_ERROR_MESSAGE%}.", 'MEMBER_WERNIS_PAYOUT_DONE' => "Auszahlung auf WDS66-Hauptaccount erfolgreich abgeschlossen. :-)", 'MEMBER_WERNIS_PAYOUT_POINTS_DEPLETED' => "Sie können nicht %s Wernis auszahlen, da Sie nur %s übrig haben.", 'MEMBER_WERNIS_STATUS' => "Überweisungsart", diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index 9033627032..7bbf24eee9 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -203,7 +203,7 @@ LIMIT 1", // @TODO Move this HTML to a template $OUT = ' -
' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '
+
{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}
'; } diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index a87d16c319..3895fd7949 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -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--}'); diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index f04859845b..b3fb7f1fa6 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -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 diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 814a19b260..035c56b875 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -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 diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 39149946aa..bb4c68d4a1 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -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 diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 96355fa9ce..e1daec9d31 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -206,7 +206,7 @@ function outputAdvancedOverview (&$result_main) { $content['purged_bonus_mails'] = '' . $value . ''; } // 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'] = '{--ADMIN_EXTENSION_BONUS_404--}'; } @@ -226,7 +226,7 @@ function outputAdvancedOverview (&$result_main) { $content['send_bonus_mails'] = '' . $value . ''; } // 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--}'; } diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 7c23a24163..f1d1f1c5e2 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -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) { diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 3419416228..db99fbdfb4 100644 --- a/inc/libs/wernis_functions.php +++ b/inc/libs/wernis_functions.php @@ -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) { diff --git a/inc/module-functions.php b/inc/module-functions.php index 781301e907..ad6cc2a906 100644 --- a/inc/module-functions.php +++ b/inc/module-functions.php @@ -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 . '%}'; diff --git a/inc/modules/admin.php b/inc/modules/admin.php index f0c295eb5f..d2b5e4cf24 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -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; diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index ebea4f2e34..70ea1ef7e1 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -1295,11 +1295,11 @@ function generateAdminLink ($adminId) { $adminLink = '' . $login . ''; } 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 = '
' . getMaskedMessage('ADMIN_ID_404', $adminId) . '
'; + $adminLink = '
{%message,ADMIN_ID_404=' . $adminId . '%}
'; } } // 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 diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index b8ed4070ad..6665a4ab1b 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -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 .= '
' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
'; + $OUT .= '
{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}
'; break; } // END - switch break; diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index 738f9d01d0..b1fb3347d8 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -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)) { diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php index 4001380d4b..770725dd1e 100644 --- a/inc/modules/admin/what-config_cats.php +++ b/inc/modules/admin/what-config_cats.php @@ -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 diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php index 4307aa33b6..9e69dc1d17 100644 --- a/inc/modules/admin/what-config_register.php +++ b/inc/modules/admin/what-config_register.php @@ -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 diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 0293640571..f23808f9f2 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -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--}'); diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php index 2c8ae73b55..04ab29ecd2 100644 --- a/inc/modules/admin/what-del_holiday.php +++ b/inc/modules/admin/what-del_holiday.php @@ -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--}'; diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php index 14035c960a..a37f7d7143 100644 --- a/inc/modules/admin/what-del_sponsor.php +++ b/inc/modules/admin/what-del_sponsor.php @@ -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&what=list_sponsor&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 diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index d22020fcbe..17b73bffd9 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -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 diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 6774b62377..5e129636a3 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -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&what=extensions&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... diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php index dc82716705..2dffa041f5 100644 --- a/inc/modules/admin/what-list_cats.php +++ b/inc/modules/admin/what-list_cats.php @@ -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 diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 39ed75b760..05397487ce 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -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 diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 367c945f1a..bd642d7818 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -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 diff --git a/inc/modules/admin/what-list_network_api_translation.php b/inc/modules/admin/what-list_network_api_translation.php index c83030e9fa..b33d521533 100644 --- a/inc/modules/admin/what-list_network_api_translation.php +++ b/inc/modules/admin/what-list_network_api_translation.php @@ -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 diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php index 99b2f1e578..0e6fc606f1 100644 --- a/inc/modules/admin/what-list_network_params.php +++ b/inc/modules/admin/what-list_network_params.php @@ -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 diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php index 65580e0cf9..436063c93a 100644 --- a/inc/modules/admin/what-list_network_types.php +++ b/inc/modules/admin/what-list_network_types.php @@ -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 diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php index 0be210ce71..6ec64e04fc 100644 --- a/inc/modules/admin/what-list_refs.php +++ b/inc/modules/admin/what-list_refs.php @@ -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 diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 713c1219fd..47afe0509e 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -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 diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php index 4efd831b63..032b8ae7db 100644 --- a/inc/modules/admin/what-list_sponsor_pay.php +++ b/inc/modules/admin/what-list_sponsor_pay.php @@ -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 diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php index 89e2a39d76..d0ec15b8b8 100644 --- a/inc/modules/admin/what-list_sponsor_pays.php +++ b/inc/modules/admin/what-list_sponsor_pays.php @@ -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 diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index 16fce750b6..c2194ec323 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -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 diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 1ca24d5824..5add439d21 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -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--}'); diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 2d6592c839..70120a8d3f 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -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 diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php index 44fa06128d..64e47cab93 100644 --- a/inc/modules/admin/what-list_yoomedia_tm.php +++ b/inc/modules/admin/what-list_yoomedia_tm.php @@ -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--}'; diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php index ed5d9ea4b5..ca5e316624 100644 --- a/inc/modules/admin/what-lock_sponsor.php +++ b/inc/modules/admin/what-lock_sponsor.php @@ -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 diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 4356f79eec..d5ca361a05 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -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; } diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php index 285e3ce60d..93e2d1c8f3 100644 --- a/inc/modules/admin/what-logs.php +++ b/inc/modules/admin/what-logs.php @@ -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? diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index 6003db9bba..04be6624f6 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/what-overview.php @@ -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 diff --git a/inc/modules/admin/what-repair_amnu.php b/inc/modules/admin/what-repair_amnu.php index 793ca9f2cd..d11699f5ff 100644 --- a/inc/modules/admin/what-repair_amnu.php +++ b/inc/modules/admin/what-repair_amnu.php @@ -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--}'; } diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php index e0293f6818..07143534eb 100644 --- a/inc/modules/admin/what-repair_cats.php +++ b/inc/modules/admin/what-repair_cats.php @@ -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 = '
{--ADMIN_REPAIR_NOTHING_FIXED--}
'; diff --git a/inc/modules/admin/what-repair_gmnu.php b/inc/modules/admin/what-repair_gmnu.php index af753414d0..23bdf1d66c 100644 --- a/inc/modules/admin/what-repair_gmnu.php +++ b/inc/modules/admin/what-repair_gmnu.php @@ -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--}'; } diff --git a/inc/modules/admin/what-repair_mmnu.php b/inc/modules/admin/what-repair_mmnu.php index 3efb04be09..becfe0a97d 100644 --- a/inc/modules/admin/what-repair_mmnu.php +++ b/inc/modules/admin/what-repair_mmnu.php @@ -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--}'; } diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index 0d6ad90037..2208230b63 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -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 = '
' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '
'; + $formContent = '
{%message,ADMIN_THEME_ALREADY_INSTALLED=' . $unix . '%}
'; // Check if current theme is already imported or not if (!ifThemeExists($unix)) { diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index b70f6b73a5..d83df3bcb1 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -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; } diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php index 36c68abe8c..6e9e43f4cd 100644 --- a/inc/modules/admin/what-user_contct.php +++ b/inc/modules/admin/what-user_contct.php @@ -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 diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index c8c30db2a2..577b030c75 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -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--}'); } diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index f6c598620b..1f09c0a3e7 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -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 diff --git a/inc/modules/member/what-cash_coupon.php b/inc/modules/member/what-cash_coupon.php index 1a63224b2e..ebc427f4f7 100644 --- a/inc/modules/member/what-cash_coupon.php +++ b/inc/modules/member/what-cash_coupon.php @@ -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--}'); diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 46baf1cd64..2583ca37a0 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -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 diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 4b9f8584bf..4e958f7ac0 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -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('
' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getProfileLock(), 0)) . '
', true); + $content['change'] = displayMessage('
{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}
', 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']); diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index eb627aa0a5..ca079da54a 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -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 diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index cf67b29643..ee2afa4f87 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -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 diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index b535b08da2..49b6390c79 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -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); diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 5505c9dbb7..7511489674 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -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 diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index bac90e4a6f..af105f761c 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -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 } diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index 6c3acd0465..8e98ea28f5 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -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 diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php index 8a4c76b1e0..f71ee51a3b 100644 --- a/inc/modules/sponsor/settings.php +++ b/inc/modules/sponsor/settings.php @@ -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 diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 58564d9b54..9be835047a 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -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 diff --git a/inc/template-functions.php b/inc/template-functions.php index f564b4c99c..4f4381e424 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -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 -- 2.39.2