More rewrites to use EL code

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index fe1ae14eb947762f051a7bc6b3dfc7abf5e55a88..e1382d6dfcc6331606364aa546730302e6f94ec4 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -35,13 +35,13 @@
 ./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
 ./inc/extensions/ext-network.php:93:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
-./inc/extensions/ext-order.php:354:            // @TODO This should be moved out to inc/daily/
+./inc/extensions/ext-order.php:358:            // @TODO This should be moved out to inc/daily/
 ./inc/extensions/ext-rallye.php:329:           // @TODO Move this code into a hook
 ./inc/extensions/ext-rallye.php:92:            // @TODO Fix config_rallye_prices to list_rallye_prices
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions-functions.php:155:    // @TODO Do we still need this? setExtensionUpdateNotes('');
-./inc/extensions-functions.php:1931:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:1943:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
 ./inc/extensions-functions.php:424:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:559:            // @TODO Extension is loaded, what next?
 ./inc/filter/bonus_filter.php:56:              // @TODO This query isn't right, it will only update if the user was for a longer time away!
@@ -121,6 +121,7 @@
 ./inc/modules/admin/what-config_mods.php:55:                   // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
 ./inc/modules/admin/what-config_points.php:110:                        // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-config_rallye_prices.php:195:                 // @TODO Rewrite these two constants
+./inc/modules/admin/what-config_rallye_prices.php:227:                 // @TODO rename: start->start_time, end->end_time
 ./inc/modules/admin/what-config_register.php:75:       // @TODO Move this HTML code into a template
 ./inc/modules/admin/what-del_email.php:61:             // @TODO Unused: cat_id, payment_id
 ./inc/modules/admin/what-edit_user.php:18: * @TODO Add support for ext-country                                    *
@@ -181,13 +182,13 @@
 ./inc/modules/member/what-unconfirmed.php:207:                         // @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:1217:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1479:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1567:          // @TODO Rewrite these lines to a filter
-./inc/mysql-manager.php:1591:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1959:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2003:// @TODO Fix inconsistency between last_module and getWhat()
-./inc/mysql-manager.php:368:   // @TODO Try to rewrite this to one or more functions
+./inc/mysql-manager.php:1220:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1482:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1570:          // @TODO Rewrite these lines to a filter
+./inc/mysql-manager.php:1594:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1962:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2006:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:371:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/purge/purge-inact.php:55:        // @TODO Rewrite these if() blocks to a filter
 ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array'

diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index d6e58bb6fdaeebdffe9ab2f9cb4b59a25adc8664..78fc3ede9104980b340afd290d6a5cd850d49117 100644 (file)
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -64,7 +64,8 @@ addMessages(array(
        'MEMBER_BONUS_POINTS_TITLE' => "Sonderbonus-{?POINTS?}",
        'MEMBER_BONUS_RANK_YOU_ARE_404' => "Sie haben bis jetzt noch keine Aktiv-Vergütung erhalten.",
        'BONUS_RANK' => "Platz",
-       'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine &Uuml;bersicht, wer alles <strong>{?POINTS?}</strong> f&uuml;r die Mail %s erhalten hat",
+       'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine &Uuml;bersicht, wer alles <strong>{?POINTS?}</strong> f&uuml;r die Mail <span class=\"data\">%s</span> 
+       erhalten hat",
        'MEMBER_BONUS_SHOW_YOU_HAVE_CONFIRMED' => "Sie haben diese Mail am",
        'MEMBER_BONUS_SHOW_CONFIRMED_BONUS_IS' => "Stelle best&auml;tigt. Ihre Zusatz-Gutschrift f&uuml;r diese Mail",
        'MEMBER_BONUS_TOTAL' => "Gesamtbonus",

diff --git a/inc/language/de.php b/inc/language/de.php
index dabacd36971caab9d5a40c60661203a0b9f10fe7..a2529f210bc7aa9be6d2ea7aba2637f03721d28e 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -46,7 +46,7 @@ addMessages(array(
        'MODULE_REGISTRY_404' => "Modul <span class=\"data\">{%pipe,getModule%}</span> existiert nicht.",
        'MODULE_REGISTRY_IS_LOCKED' => "Das Modul <span class=\"data\">{%pipe,getModule%}</span> wurde gesperrt.",
        'MODULE_ERROR_404' => "Fehler: Modul nicht gefunden",
-       'UNKNOWN_MODULE_DETECTED' => "Unbekanntes Modul %s",
+       'UNKNOWN_MODULE_DETECTED' => "Unbekanntes Modul <span class=\"data\">%s</span>",
        'MAILER_WARNING' => "Warnung",
        'DIE_CONFIG_CHANGED_YOU' => "Sie haben Ihre Config-Datei editiert! Auf Wiedersehen...",
        'DIE_RUN_INSTALL_MYSQL' => "Bitte rufen Sie http://your-domain.com/install.php auf, damit die Konfigurationsdaten zur Datenbank eingerichtet werden k&ouml;nnen.",
@@ -108,7 +108,7 @@ addMessages(array(
        'ADMIN_LOGOUT_FAILED' => "Konnte nicht aus dem Admin-Bereich ausloggen! :-(",
        'ADMIN_RELOGIN_LINK' => "Klicken Sie hier, um sich erneut einzuloggen.",
        'ADMIN_ACTION_404' => "Das aufgerufe Admin-Hauptmen&uuml; <span class=\"data\">%s</span> ist zwar g&uuml;ltig, konnte aber nicht auf dem Server gefunden werden.",
-       'ADMIN_WHAT_404' => "Das aufgerufe Admin-Untermen&uuml; <span class=\"data\">%s</span> ist zwar g&uuml;ltig, konnte aber nicht auf dem Server gefunden werden.",
+       'ADMIN_WHAT_404' => "Das aufgerufe Admin-Untermen&uuml; <span class=\"data\">{%pipe,getWhat%}</span> ist zwar g&uuml;ltig, konnte aber nicht auf dem Server gefunden werden.",
        'ADMIN_MAIN_TITLE' => "Willkommen zum Administrationsbereich",
        'YOU_ARE_HERE' => "Sie sind hier:",
        'ID_SELECT' => "ID:",
@@ -240,8 +240,8 @@ addMessages(array(
        'ADMIN_GUEST_PERSONA_DATA' => "Hier sind zur &Uuml;berpr&uuml;fung nochmals seine pers&ouml;nlichen Daten",
        'ADMIN_NEW_ACCOUNT_SUBJECT' => "Neue Anmeldung zu Ihrem {?mt_word?}",
        'REGISTRATION_DONE' => "Vielen Dank f&uuml;r die Anmeldung. Ein Best&auml;tigungslink ist zur angemeldeten EMail-Adresse unterwegs.",
-       'GUEST_404_WHAT' => "Das angegeben Men&uuml;modul <span class=\"data\">%s</span> existiert leider nicht, oder dieses Script hat einen Fehler gemacht.",
-       'GUEST_LOCKED_ACTION' => "Aktionsmodul <span class=\"data\">%s</span> wurde gesperrt.",
+       'GUEST_WHAT_404' => "Das angegeben Men&uuml;modul <span class=\"data\">{%pipe,getWhat%}</span> existiert leider nicht, oder dieses Script hat einen Fehler gemacht.",
+       'MEMBER_WHAT_404' => "Das angegeben Mitgliedsmen&uuml;modul <span class=\"data\">{%pipe,getWhat%}</span> existiert leider nicht, oder dieses Script hat einen Fehler gemacht.",
        'FATAL_REPORT_ERRORS' => "Es wurde ein Problem w&auml;hrend der Abarbeitung von Anweisungen festgestellt. Wenn ein Modul gesperrt sein sollte, so wird vermutlich gerade dran gearbeitet, anderfalls melden Sie sich bitte bei uns.",
        'TEMPLATE_404' => "Template nicht gefunden.",
        'ADMIN_EDIT_GUEST_MENU_TITLE' => "G&auml;stemen&uuml; bearbeiten",
@@ -1064,7 +1064,7 @@ addMessages(array(
        'ADMIN_WARNING_SQL_PATCHES_MISSING' => "Eine essentielle Erweiterung <span class=\"data\">sql_patches</span> ist noch nicht installiert. Bitte erledigen Sie dies bald, da Ihr {?mt_word?} sonst nicht funktioniert.",
        'ADMIN_EXTENSION_IS_NON_PRODUCTIVE' => "Die von Ihnen ausgew&auml;hlte Erweiterung <span class=\"data\">%s</span> ist noch nicht f&uuml;r den produktiven Betrieb freigegeben und befindet sich somit noch in der Entwicklung. Bitte nur verwenden, wenn Sie wissen, was Sie tun.",
        'ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK' => "Entwickler-Version",
-       '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_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE' => "Die Erweiterung <span class=\"data\">%s</span> 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.",
@@ -1132,8 +1132,8 @@ addMessages(array(
        'ADMIN_STATUS_CHANGED' => "Es wurden <span class=\"data\">%s</span> von <span class=\"data\">%s</span> Eintr&auml;gen ge&auml;ndert.",
 
        // Missing menu entries
-       'ADMIN_MENU_ACTION_404' => "Hauptmen&uuml; %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
-       'ADMIN_MENU_WHAT_404' => "Untermen&uuml; %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
+       'ADMIN_MENU_ACTION_404' => "Hauptmen&uuml; <span class=\"data\">%s</span> deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
+       'ADMIN_MENU_WHAT_404' => "Untermen&uuml; <span class=\"data\">%s</span> deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
 
        // Cache messages
        'CACHE_PROBLEMS_DETECTED' => "Probleme mit dem Cache-Subsystem erkannt.",

diff --git a/inc/language/primera_de.php b/inc/language/primera_de.php
index 1972060eb51be450bd73c6754cedc5f956357f7e..0dce9523f8c2f1142520134b3ae22662c67c0670 100644 (file)
--- a/inc/language/primera_de.php
+++ b/inc/language/primera_de.php
@@ -81,8 +81,8 @@ addMessages(array(
        'PRIMERA_API_REQUEST_FAILED_OWN' => "Überweisung an eigenes Account nicht möglich.",
        'PRIMERA_API_REQUEST_FAILED_AMOUNT' => "Konto weist nicht genügend Deckung auf.",
        'PRIMERA_API_REQUEST_FAILED_API_AMOUNT' => "Primera-Account weist nicht genügend Deckung auf.",
-       'PRIMERA_API_PURPOSE_WITHDRAW' => "Einzahlung auf {?MAIN_TITLE?} ({?URL?}), id: %s",
-       'PRIMERA_API_PURPOSE_PAYOUT' => "Auszahlung von {?MAIN_TITLE?} ({?URL?}), id: %s",
+       'PRIMERA_API_PURPOSE_WITHDRAW' => "Einzahlung auf {?MAIN_TITLE?} ({?URL?}), id: <span class=\"data\">%s</span>",
+       'PRIMERA_API_PURPOSE_PAYOUT' => "Auszahlung von {?MAIN_TITLE?} ({?URL?}), id: <span class=\"data\">%s</span>",
 
 // Error messages
        'PRIMERA_ERROR_STATUS' => "Fehler-Status <span class=\"data\">%s</span> erhalten.",

diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php
index b15bafd73b1f36776a24d4f71484b2fe7b06a45d..cb09da98cd4712c9a660cc64993e40e4467048af 100644 (file)
--- a/inc/language/rallye_de.php
+++ b/inc/language/rallye_de.php
@@ -100,11 +100,11 @@ addMessages(array(
        'RALLYE_EDIT_ONLY_INACTIVE_NOTE' => "Es können nur deaktivierte Referal-Rallyes bearbeitet bzw. gelöscht werden. Beim Löschen werden alle dazu verknüpften Daten ebenfalls ohne Vorwarnung gelöscht.",
        'RALLYE_DELETE_NOTHING_SELECTED' => "Keine Referal-Rallye(s) zum Löschen ausgewählt.",
        'RALLYE_DELETED' => "Rallye(s) wurde(n) gelöscht.",
-       'RALLYE_MEMBER_NO_PRICES' => "--> Keine Preise  f&uuml;r Modus %s ausgesetzt! <--",
+       'RALLYE_MEMBER_NO_PRICES' => "--> Keine Preise  f&uuml;r Modus <span class=\"data\">%s</span> ausgesetzt! <--",
        'RALLYE_MEMBER_PRICES_ADDED' => "Die Preise",
        'RALLYE_PRICE' => ". Platz",
-       'RALLYE_MEMBER_NOTIFY' => "REF-RALLYE GESTARTET: %s",
-       'RALLYE_ADMIN_NOTIFY' => "Neue Ref-Rallye: %s",
+       'RALLYE_MEMBER_NOTIFY' => "REF-RALLYE GESTARTET: <span class=\"data\">%s</span>",
+       'RALLYE_ADMIN_NOTIFY' => "Neue Ref-Rallye: <span class=\"data\">%s</span>",
        'RALLYE_ADMIN_USERS_404' => "Zur ausgew&auml;hlten Referal-Rallye sind noch keine Mitglieder hinzugef&uuml;gt worden.",
        'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye <span class=\"data\">%s</span>",
        'RALLYE_OLD_REFS' => "Refs vor Referal-Rallye",
@@ -116,7 +116,7 @@ addMessages(array(
        'RALLYE_EXPIRE_ONE_DAY' => "Rallye endet in weniger als 24 Stunden.",
        'RALLYE_HAS_EXPIRED' => "Diese Referal-Rallye ist beendet.",
        'RALLYE_ADMIN_EXPIRED' => "Rallye beendet",
-       'RALLYE_ADMIN_EXPIRED_SUBJECT' => "Rallye beendet: %s",
+       'RALLYE_ADMIN_EXPIRED_SUBJECT' => "Rallye beendet: <span class=\"data\">%s</span>",
        'RALLYE_MEMBER_EXPIRED_SUBJECT' => "REF-RALLYE BEENDET: %s. Platz",
        'RALLYE_YOU_CAN_WIN' => "Was Sie gewinnen k&ouml;nnen",
        'RALLYE_OUR_WINNERS_ARE' => "Unsere Gewinner sind dieses Mal",

diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index f3b1f7c2c58b23dc4218b16b665f508907c27c59..fd94f7589ad22191937857209f72ca47554acf39 100644 (file)
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -245,8 +245,8 @@ addMessages(array(
 
 // Internal errors
        'MEMBER_SURFBAR_EXECUTE_ACTION_404' => "Auszuf&uuml;hrende Funktion <span class=\"data\">%s</span> nicht gefunden.",
-       'ADMIN_SURFBAR_NOTIFY_SUBJECT_404' => "Admin-Betreffzeile %s nicht gefunden.",
-       'MEMBER_SURFBAR_NOTIFY_SUBJECT_404' => "Mitglieder-Betreffzeile %s nicht gefunden.",
+       'ADMIN_SURFBAR_NOTIFY_SUBJECT_404' => "Admin-Betreffzeile <span class=\"data\">%s</span> nicht gefunden.",
+       'MEMBER_SURFBAR_NOTIFY_SUBJECT_404' => "Mitglieder-Betreffzeile <span class=\"data\">%s</span> nicht gefunden.",
 
 // Guest texts
        'GUEST_SURFBAR_LOGIN_HEADER' => "Login zur Surfbar:",

diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php
index 7b1acf2c8141438d21ac8302c21000da08205b65..157b28698bba7aa49da1661c6117c7250cc8a176 100644 (file)
--- a/inc/language/wernis_de.php
+++ b/inc/language/wernis_de.php
@@ -91,8 +91,8 @@ addMessages(array(
        'WERNIS_API_REQUEST_FAILED_OWN' => "Überweisung an eigenes Account nicht möglich.",
        'WERNIS_API_REQUEST_FAILED_AMOUNT' => "Konto weist nicht genügend Deckung auf.",
        'WERNIS_API_REQUEST_FAILED_API_AMOUNT' => "API-Konto weist nicht genügend Deckung auf.",
-       'WERNIS_API_PURPOSE_WITHDRAW' => "Einzahlung auf {?MAIN_TITLE?} ({?URL?}), id: %s",
-       'WERNIS_API_PURPOSE_PAYOUT' => "Auszahlung von {?MAIN_TITLE?} ({?URL?}), id: %s",
+       'WERNIS_API_PURPOSE_WITHDRAW' => "Einzahlung auf {?MAIN_TITLE?} ({?URL?}), id: <span class=\"data\">%s</span>",
+       'WERNIS_API_PURPOSE_PAYOUT' => "Auszahlung von {?MAIN_TITLE?} ({?URL?}), id: <span class=\"data\">%s</span>",
 
        // Error messages
        'WERNIS_ERROR_STATUS' => "Fehler-Status <span class=\"data\">%s</span> erhalten.",

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index a8ccb8aad838e883e3975627108d6b7d04efb267..a87d16c319831a0542616d4993d2380975dd43ce 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -752,7 +752,7 @@ function doAdminNetworkProcessAddNetwork () {
        // We can say here, the form is sent, so check if the network is already added
        if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
                // Already there
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestParameter('network_short_name') . '%}');
                return false;
        } // END - if
 
@@ -777,7 +777,7 @@ function doAdminNetworkProcessAddNetwork () {
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestParameter('network_short_name') . '%}');
        }
 }
 
@@ -1017,7 +1017,7 @@ function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestParameter('network_type_handle') . '%}');
 
                // ... so abort here
                return false;
@@ -1050,7 +1050,7 @@ function doAdminNetworkProcessAddNetworkType () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestParameter('network_type_handle') . '%}');
        }
 }
 
@@ -1215,7 +1215,7 @@ function doAdminNetworkProcessAddNetworkParam () {
        // Is the request parameter already used with given network?
        if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestParameter('request_param_key') . '%}');
 
                // ... so abort here
                return false;
@@ -1248,7 +1248,7 @@ function doAdminNetworkProcessAddNetworkParam () {
                loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestParameter('request_param_key') . '%}');
        }
 }
 
@@ -1257,7 +1257,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        // Is the request parameter already used with given network?
        if (isNetworkApiTranslationValid(postRequestParameter('network_api_index'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED', postRequestParameter('network_api_index')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestParameter('network_api_index') . '%}');
 
                // ... so abort here
                return false;
@@ -1294,7 +1294,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
                loadTemplate('admin_network_api_translation_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED', postRequestParameter('network_api_index')));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED=' . postRequestParameter('network_api_index') . '%}');
        }
 }
 

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 1d50a4d95c23f48e3f9e9a656f89906719cbe56f..f04859845b9e1099e490fa7061c4d020f5a01cbb 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -157,7 +157,7 @@ WHERE
                if (($notify == 'Y') && ($un)) {
                        // Load email template and send it to the user
                        $message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
-                       sendEmail($content['userid'], getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
+                       sendEmail($content['userid'], '{%message,RALLYE_MEMBER_NOTIFY=' . $title . '%}', $message);
                } // END - if
        } // END - while
 
@@ -398,7 +398,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
 
                        // Send notification to member
                        $message = loadEmailTemplate('member_rallye_notify', $content, $userid);
-                       sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
+                       sendEmail($userid, '{%message,RALLYE_MEMBER_NOTIFY=' . $title . '%}', $message);
                } // END - if
 
                // Check if line is already included...
@@ -527,7 +527,7 @@ function markReferalRallyesAsExpired ($result) {
 
                                // Load template
                                $message = loadEmailTemplate($template, $DATA, $userid);
-                               sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJECT', $DATA['level']), $message);
+                               sendEmail($userid, '{%message,RALLYE_MEMBER_EXPIRED_SUBJECT=' . $DATA['level'] . '%}', $message);
                        } // END - if
 
                        // Count userid

diff --git a/inc/modules/admin/action- b/inc/modules/admin/action-
index c825e62a5f0732befd592f3294cc4c53c253ad0b..0108cbb68edfdc10df2f28abe0c78ea439584282 100644 (file)
--- a/inc/modules/admin/action-
+++ b/inc/modules/admin/action-
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('ADMIN_WHAT_404', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php
index 0c426c9c762b7bcb3e065808c2bff5bf1847aa13..cd1f758e2e89f0d8f3485f8efc8c78c09fba6a3e 100644 (file)
--- a/inc/modules/admin/action-admins.php
+++ b/inc/modules/admin/action-admins.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-bank.php b/inc/modules/admin/action-bank.php
index 5a576d14b071b34b11ac00a856540c78598b3873..9f480a8f52e8599ca3868db93a28c3f5074d9624 100644 (file)
--- a/inc/modules/admin/action-bank.php
+++ b/inc/modules/admin/action-bank.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index e1ff06240129ceb464424aa09df77dbb3ec3c9f3..19d3ebe13163ca72c9c3578e501211c469273803 100644 (file)
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-coupon.php b/inc/modules/admin/action-coupon.php
index d40bd88add052707e8c5a927550333fd0d888e4c..eb4d28474cbd0fe6d1200991141e372e36ffea01 100644 (file)
--- a/inc/modules/admin/action-coupon.php
+++ b/inc/modules/admin/action-coupon.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('ADMIN_WHAT_404', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php
index 064b96f90cd37976ebd1311e63c2295a3ae1ee74..cad4a19dedb317c80cc7b8947351fdb7361c16e9 100644 (file)
--- a/inc/modules/admin/action-doubler.php
+++ b/inc/modules/admin/action-doubler.php
@@ -50,7 +50,7 @@ if (isIncludeReadable($inc)) {
        loadInclude($inc);
 } else {
        // "what file" not found
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index 6f9ea8016773b26936f0e65f4ef99d503347e87a..471d4a0d6fc54c9bb755b910b28afd364ca47b1c 100644 (file)
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index 0615e6a515e5cf540e0568f3554ece2815059833..33a436a000f2625af8eb1fe7fbb938b35a3744ea 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php
index b529969a14ba19fa83097cdf419f3d7308f51281..2f30c35cd85cd2b3f1713bf7d7341bd50cb3ab01 100644 (file)
--- a/inc/modules/admin/action-login.php
+++ b/inc/modules/admin/action-login.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php
index 0e910b2baaacc3c944d6a35e919a72d2adce8200..ac4f71a20effffe7c8c7410fa0372c2c77edf0d4 100644 (file)
--- a/inc/modules/admin/action-menu.php
+++ b/inc/modules/admin/action-menu.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index 5f983c361f3d2e877bd350d9cab3d327f3afde28..fb69c31bb6fe8a42b330753713e3e1c373bfc2d9 100644 (file)
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php
index 4c9381eb10bf8fab59d88bde242b397e04603115..aa0b5b31908836ab677904b618fe22b5c3896a45 100644 (file)
--- a/inc/modules/admin/action-mods.php
+++ b/inc/modules/admin/action-mods.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-network.php b/inc/modules/admin/action-network.php
index cc8e8f0497bcb02f01bbd4b7b8c9bc04b587946e..23fef270120bac370eca837c489012c106a4f163 100644 (file)
--- a/inc/modules/admin/action-network.php
+++ b/inc/modules/admin/action-network.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('ADMIN_WHAT_404', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php
index 3a855ff9c51d77d27a4eb6fa3140149fb656b8ac..18284c2bc5b25118fa81edbe154da3485efe2fea 100644 (file)
--- a/inc/modules/admin/action-newsletter.php
+++ b/inc/modules/admin/action-newsletter.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php
index 0a4fc8f5bda92cdcd414210d8c4854a3a61d4dcf..23cab971499876e6da9c0c6b6419551714ee65f1 100644 (file)
--- a/inc/modules/admin/action-payouts.php
+++ b/inc/modules/admin/action-payouts.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-primera.php b/inc/modules/admin/action-primera.php
index cdcfc58c3bd4aa0686c35be9902c59844fd0b4c9..dc97b2f7e32f5677344661363c07d233b08227bd 100644 (file)
--- a/inc/modules/admin/action-primera.php
+++ b/inc/modules/admin/action-primera.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php
index 745db75765b92656bf36e8f19af3fd8eabba83e0..6acb91746790c0641fa19bf84498fffac78d68ad 100644 (file)
--- a/inc/modules/admin/action-rallye.php
+++ b/inc/modules/admin/action-rallye.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php
index ad024fab358bd87c325ac7fc9391d092769c407b..a59769f3fb40e291c3ee5ffa352726c67850da08 100644 (file)
--- a/inc/modules/admin/action-repair.php
+++ b/inc/modules/admin/action-repair.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php
index 81869b9f5bd11c377dd3b00c3e3e64778458251c..623b180b640fb0d41e72217849064b60e559703e 100644 (file)
--- a/inc/modules/admin/action-setup.php
+++ b/inc/modules/admin/action-setup.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php
index d6bb3c31b5a9efdf91179bb6e22973fa4be0cfaf..0b757cedcebc8954498a009558f480d7b41e5a42 100644 (file)
--- a/inc/modules/admin/action-sponsor.php
+++ b/inc/modules/admin/action-sponsor.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php
index 8d68d5227c22e577319897d84f99a93cd24a2469..9a0178e910295905d20bf88f9c103db45fcfcf2b 100644 (file)
--- a/inc/modules/admin/action-stats.php
+++ b/inc/modules/admin/action-stats.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-surfbar.php b/inc/modules/admin/action-surfbar.php
index 23734c49748ae4c6f5b5b47efa38d41b29ffe996..581d725294633975fb5f8210c2eaf8e298bf9646 100644 (file)
--- a/inc/modules/admin/action-surfbar.php
+++ b/inc/modules/admin/action-surfbar.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 6998ed2788246a473f57637665c4f3dc5d59b0d1..1716b20c47d552fdaa1e7c13bb862eeddf527655 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php
index cb3dc4a4ea9912ec485ad1fef9c66a5c8f3e604e..fbdb53694711f7371317b5abd3ac7e5a228525b4 100644 (file)
--- a/inc/modules/admin/action-theme.php
+++ b/inc/modules/admin/action-theme.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php
index 0f1a430339a4aeb35503187d6b51920554f0e6a6..26692f54879948828cf993a0ee8a52eb666e2a02 100644 (file)
--- a/inc/modules/admin/action-transfer.php
+++ b/inc/modules/admin/action-transfer.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php
index 4a5cc64932dfc462815ca7e7da0608fd4753a9d8..f208bb26d235a3d1a39bce2fbabadf6bd6129004 100644 (file)
--- a/inc/modules/admin/action-user.php
+++ b/inc/modules/admin/action-user.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php
index 3f52a153a3380c5514f9d20cfea8d51103701673..ec3dbae3e8b35c5b94533d633433cea409164f8d 100644 (file)
--- a/inc/modules/admin/action-wernis.php
+++ b/inc/modules/admin/action-wernis.php
@@ -49,7 +49,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 82cb196abecc01361e90e739d807cffacc204b56..c97eac07a05d8e7df43ba1676e7b76c7be0ca7ec 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -216,14 +216,14 @@ LIMIT 1",
                        loadInclude($inc);
                } elseif ($GLOBALS['acl_allow'] === false) {
                        // Access denied
-                       loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
+                       loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
                } else {
                        // Include file not found :-(
-                       loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action));
+                       loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
                }
        } else {
                // Invalid action/what pair found
-               loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
+               loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 64de25a6b412fda51a823974056520e87f249b0c..3ab13856dd0a09baf38601915fc6a3726434ce2b 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -117,7 +117,7 @@ if (getRequestParameter('userid') == 'all') {
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 9b92287488d63e7995bc9d1c11cde10ecb4b9dd8..7b4fb0a4e371de935403dd41e58c1b9bd35aea33 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -224,14 +224,9 @@ ORDER BY
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare data for the row template
-                       $content = array(
-                               'id'         => $content['id'],
-                               'title'      => $content['title'],
-                               'admin_id'   => $content['admin_id'],
-                               'login'      => $content['login'],
-                               'start'      => generateDateTime($content['start_time'], 3),
-                               'end'        => generateDateTime($content['end_time'], 3),
-                       );
+                       // @TODO rename: start->start_time, end->end_time
+                       $content['start'] = generateDateTime($content['start_time'], '3');
+                       $content['end']   = generateDateTime($content['end_time']  , '3');
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_list_rallye_prices_row', true, $content);

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 2f84947b9ee19eb4c22e7264bfeec3460a213cac..7ce0dedf6d04d793065263342124cc668867cca2 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -54,7 +54,7 @@ if ((isFormSent()) || ((isFormSent('delete')) && (isPostRequestParameterSet('rea
                displayMessage('{--ADMIN_DELETE_COMPLETED--}');
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } elseif (isPostRequestParameterSet('no')) {
        // Do not delete him...
@@ -75,7 +75,7 @@ if ((isFormSent()) || ((isFormSent('delete')) && (isPostRequestParameterSet('rea
                loadTemplate('admin_delete_user', false, $content);
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')), '%}');
        }
 }
 

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index b9e64937b19817d4828b1def6d5f84092f07d152..3ef52c45ce240d1180ab9f11913eb05253c44a0f 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -126,7 +126,7 @@ LIMIT 1",
        }
 } else {
        // Account does not exists!
-       loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+       loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
 }
 
 // Free the result

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index b01c6d3627a6ff624e463e36230d9011a19fe25c..4356f79eec4fea5a03f97271c10ff48e17c114f3 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -148,7 +148,7 @@ LIMIT 1",
                                loadTemplate('admin_lock_user', false, $content);
                        } else {
                                // Account does not exists!
-                               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')), '%}');
                        }
                }
 
@@ -166,7 +166,7 @@ LIMIT 1",
                }
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')), '%}');
        }
 } else {
        // List all users

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 25a1ac7d99d13b7e0138e89e6f133dd8496ad82e..715ae4df2fe6de66d1dc34b37b4c5bfb481d1557 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -110,7 +110,7 @@ if (getRequestParameter('userid') == 'all') {
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index f8cdcc1d46ca380b94a2a948892508ff86f7635e..840262730f7c8e99bf997c477f09ef84c5eb5811 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -57,7 +57,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('GUEST_LOCKED_ACTION', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index defe162ffbed893008d923b13479f56d57833a89..79ce693926274f7f983395c7b2526e9718b52fa7 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -52,7 +52,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index c7ab4a6669239a9febb567cb746c344d25acec97..b05d176a12497ec4f84934821f7566b2c67adb74 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -52,7 +52,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index 4560edc488cf13df4eb2d0bbe59b5f4bde66850e..561b3ca0ba810574faf21d3befc184647cf6085e 100644 (file)
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -52,7 +52,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index ccd622c2db13f1b096f9ed3905791fd672b40306..d722817bb8b6f54f76fdd27968435c2efeae8f14 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -48,7 +48,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index ec95c9aa6ce7bcafc4e4552be6478676730ff8c7..e528dfc9851a75f9ca62b5b9345034dff635af3e 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -59,7 +59,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_404_WHAT--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-account.php b/inc/modules/member/action-account.php
index 65dcb3c3ffa383062a68401d7f943e464e0732f5..7649a8e1361afbc8183541e39e75bb585416bb26 100644 (file)
--- a/inc/modules/member/action-account.php
+++ b/inc/modules/member/action-account.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index 4980981e94d5641a628113b4d21f0cfcf34a23a1..542012af60b1c40885a158873ffcfc972856572f 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -59,7 +59,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-coupon.php b/inc/modules/member/action-coupon.php
index 0d28088029c087fe2ec0a61ee7d4dcbb8c20c60f..20ea631c0a6ba2c8b7d1b14e8c8a1f73f9b20644 100644 (file)
--- a/inc/modules/member/action-coupon.php
+++ b/inc/modules/member/action-coupon.php
@@ -59,7 +59,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_404_WHAT--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}', getWhat());
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-earn.php b/inc/modules/member/action-earn.php
index 56a4c59ff33eb079de676dda08240a5c4d5c3a5e..00565bf7cc3c6c4c76ee62616d9549e79bf3bc25 100644 (file)
--- a/inc/modules/member/action-earn.php
+++ b/inc/modules/member/action-earn.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_404_WHAT--}', getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}', getWhat());
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index 850695a7a52e7a947aab1a815ee448120f1326d7..4eedb749cc3fb6d8a74a06625a8aec36965d041a 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index 4bd54e24a991c7fd079986294cc6e52873900313..ed2fbd6ddf19d1313ef8abd9a1e7cb1c4329f286 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php
index 28ba0e6cd25a0febde6c681eb9c3a90f706235dd..4fd861d71f0f87f71829cbb7707f300c686c6504 100644 (file)
--- a/inc/modules/member/action-main.php
+++ b/inc/modules/member/action-main.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index e50d203a1295a5430c0d2294eb3bbe8559729b5c..16654635f630f7190ffd05a1158c6627902ff4db 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -59,7 +59,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php
index 2f7a263b962047699d9bc0253be4241ed0e7f849..215105f4b4d84fac543d4f38998461339ae99224 100644 (file)
--- a/inc/modules/member/action-rals.php
+++ b/inc/modules/member/action-rals.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php
index f77ee063c185684e8dd7fe9befc2d06c2c34a8bf..bbc20d9d10b59b27826ab942e93f1d29c680a481 100644 (file)
--- a/inc/modules/member/action-stats.php
+++ b/inc/modules/member/action-stats.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index 45990768d0e2946086b5e5fb22944755af136663..dcaeb514928bcc43e2d6fa40e749d7df2379fc89 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -59,7 +59,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MEMBER_404_WHAT', getWhat()));
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_WHAT_404--}');
 }
 
 // [EOF]

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 0c4a786a4c1afc09d644e61ab0120022dcd897f9..96df72550de1d131110fe80980629711184ddf1d 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -89,7 +89,7 @@ if ($isValid === true) {
        } // END - if
 
        // Load Template
-       loadTemplate('member_nickname_form', false, getNickname(getMemberId()));
+       loadTemplate('member_nickname_form');
 }
 
 // [EOF]

diff --git a/modules.php b/modules.php
index 247d98cd48f0f7b4a63ed123f20d330aa01228f8..09fef371356da546aa1a7951a32f55c8a8a42d18 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -123,7 +123,7 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin(
                default:
                        // Unknown module status
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $moduleState, getModule()));
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $moduleState));
+                       addFatalMessage(__FILE__, __LINE__, '{%message,UNKNOWN_MODULE_STATUS=' . $moduleState . '%}');
                        break;
        } // END - switch
 } elseif (!ifFatalErrorsDetected()) {

diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl
index bc85b013df5a23275c468deac49998a449d0054c..8315a731055b305260eb153e00d74d6466299fe1 100644 (file)
--- a/templates/de/html/member/member_nickname_form.tpl
+++ b/templates/de/html/member/member_nickname_form.tpl
@@ -16,7 +16,7 @@
                        {--MEMBER_NICKNAME_ENTER_NICKNAME--}:
                </td>
                <td>
-                       <input type="text" class="form_field" name="nickname" size="30" maxlength="30" value="$content" />
+                       <input type="text" class="form_field" name="nickname" size="30" maxlength="30" value="{%pipe,getMemberId,getNickname%}" />
                </td>
        </tr>
        <tr>