From: Roland Häder Date: Mon, 4 Jul 2011 21:35:49 +0000 (+0000) Subject: More rewrites to use EL code X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=82cbb1b75e0091b6333fefd045903329b234b9fb;p=mailer.git More rewrites to use EL code --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index fe1ae14eb9..e1382d6dfc 100644 --- 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 d6e58bb6fd..78fc3ede91 100644 --- 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 Übersicht, wer alles {?POINTS?} für die Mail %s erhalten hat", + 'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine Übersicht, wer alles {?POINTS?} für die Mail %s + erhalten hat", 'MEMBER_BONUS_SHOW_YOU_HAVE_CONFIRMED' => "Sie haben diese Mail am", 'MEMBER_BONUS_SHOW_CONFIRMED_BONUS_IS' => "Stelle bestätigt. Ihre Zusatz-Gutschrift für diese Mail", 'MEMBER_BONUS_TOTAL' => "Gesamtbonus", diff --git a/inc/language/de.php b/inc/language/de.php index dabacd3697..a2529f210b 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -46,7 +46,7 @@ addMessages(array( 'MODULE_REGISTRY_404' => "Modul {%pipe,getModule%} existiert nicht.", 'MODULE_REGISTRY_IS_LOCKED' => "Das Modul {%pipe,getModule%} wurde gesperrt.", 'MODULE_ERROR_404' => "Fehler: Modul nicht gefunden", - 'UNKNOWN_MODULE_DETECTED' => "Unbekanntes Modul %s", + 'UNKNOWN_MODULE_DETECTED' => "Unbekanntes Modul %s", '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ö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ü %s ist zwar gültig, konnte aber nicht auf dem Server gefunden werden.", - 'ADMIN_WHAT_404' => "Das aufgerufe Admin-Untermenü %s ist zwar gültig, konnte aber nicht auf dem Server gefunden werden.", + 'ADMIN_WHAT_404' => "Das aufgerufe Admin-Untermenü {%pipe,getWhat%} ist zwar gü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 Überprüfung nochmals seine persönlichen Daten", 'ADMIN_NEW_ACCOUNT_SUBJECT' => "Neue Anmeldung zu Ihrem {?mt_word?}", 'REGISTRATION_DONE' => "Vielen Dank für die Anmeldung. Ein Bestätigungslink ist zur angemeldeten EMail-Adresse unterwegs.", - 'GUEST_404_WHAT' => "Das angegeben Menümodul %s existiert leider nicht, oder dieses Script hat einen Fehler gemacht.", - 'GUEST_LOCKED_ACTION' => "Aktionsmodul %s wurde gesperrt.", + 'GUEST_WHAT_404' => "Das angegeben Menümodul {%pipe,getWhat%} existiert leider nicht, oder dieses Script hat einen Fehler gemacht.", + 'MEMBER_WHAT_404' => "Das angegeben Mitgliedsmenümodul {%pipe,getWhat%} existiert leider nicht, oder dieses Script hat einen Fehler gemacht.", 'FATAL_REPORT_ERRORS' => "Es wurde ein Problem wä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ästemenü bearbeiten", @@ -1064,7 +1064,7 @@ addMessages(array( 'ADMIN_WARNING_SQL_PATCHES_MISSING' => "Eine essentielle Erweiterung sql_patches 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ählte Erweiterung %s ist noch nicht fü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 %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.", @@ -1132,8 +1132,8 @@ addMessages(array( 'ADMIN_STATUS_CHANGED' => "Es wurden %s von %s Einträgen geändert.", // Missing menu entries - 'ADMIN_MENU_ACTION_404' => "Hauptmenü %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.", - 'ADMIN_MENU_WHAT_404' => "Untermenü %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.", + 'ADMIN_MENU_ACTION_404' => "Hauptmenü %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.", + 'ADMIN_MENU_WHAT_404' => "Untermenü %s 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 1972060eb5..0dce9523f8 100644 --- 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: %s", + 'PRIMERA_API_PURPOSE_PAYOUT' => "Auszahlung von {?MAIN_TITLE?} ({?URL?}), id: %s", // Error messages 'PRIMERA_ERROR_STATUS' => "Fehler-Status %s erhalten.", diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php index b15bafd73b..cb09da98cd 100644 --- 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ür Modus %s ausgesetzt! <--", + 'RALLYE_MEMBER_NO_PRICES' => "--> Keine Preise für Modus %s 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: %s", + 'RALLYE_ADMIN_NOTIFY' => "Neue Ref-Rallye: %s", 'RALLYE_ADMIN_USERS_404' => "Zur ausgewählten Referal-Rallye sind noch keine Mitglieder hinzugefügt worden.", 'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye %s", '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: %s", 'RALLYE_MEMBER_EXPIRED_SUBJECT' => "REF-RALLYE BEENDET: %s. Platz", 'RALLYE_YOU_CAN_WIN' => "Was Sie gewinnen kö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 f3b1f7c2c5..fd94f7589a 100644 --- 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ührende Funktion %s 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 %s nicht gefunden.", + 'MEMBER_SURFBAR_NOTIFY_SUBJECT_404' => "Mitglieder-Betreffzeile %s 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 7b1acf2c81..157b28698b 100644 --- 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: %s", + 'WERNIS_API_PURPOSE_PAYOUT' => "Auszahlung von {?MAIN_TITLE?} ({?URL?}), id: %s", // Error messages 'WERNIS_ERROR_STATUS' => "Fehler-Status %s erhalten.", diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index a8ccb8aad8..a87d16c319 100644 --- 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 1d50a4d95c..f04859845b 100644 --- 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 c825e62a5f..0108cbb68e 100644 --- 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 0c426c9c76..cd1f758e2e 100644 --- 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 5a576d14b0..9f480a8f52 100644 --- 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 e1ff062401..19d3ebe131 100644 --- 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 d40bd88add..eb4d28474c 100644 --- 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 064b96f90c..cad4a19ded 100644 --- 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 6f9ea80167..471d4a0d6f 100644 --- 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 0615e6a515..33a436a000 100644 --- 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 b529969a14..2f30c35cd8 100644 --- 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 0e910b2baa..ac4f71a20e 100644 --- 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 5f983c361f..fb69c31bb6 100644 --- 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 4c9381eb10..aa0b5b3190 100644 --- 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 cc8e8f0497..23fef27012 100644 --- 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 3a855ff9c5..18284c2bc5 100644 --- 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 0a4fc8f5bd..23cab97149 100644 --- 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 cdcfc58c3b..dc97b2f7e3 100644 --- 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 745db75765..6acb917467 100644 --- 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 ad024fab35..a59769f3fb 100644 --- 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 81869b9f5b..623b180b64 100644 --- 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 d6bb3c31b5..0b757cedce 100644 --- 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 8d68d5227c..9a0178e910 100644 --- 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 23734c4974..581d725294 100644 --- 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 6998ed2788..1716b20c47 100644 --- 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 cb3dc4a4ea..fbdb536947 100644 --- 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 0f1a430339..26692f5487 100644 --- 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 4a5cc64932..f208bb26d2 100644 --- 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 3f52a153a3..ec3dbae3e8 100644 --- 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 82cb196abe..c97eac07a0 100644 --- 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 64de25a6b4..3ab13856dd 100644 --- 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 9b92287488..7b4fb0a4e3 100644 --- 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 2f84947b9e..7ce0dedf6d 100644 --- 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 b9e64937b1..3ef52c45ce 100644 --- 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 b01c6d3627..4356f79eec 100644 --- 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'))) . ''); + 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 25a1ac7d99..715ae4df2f 100644 --- 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 f8cdcc1d46..840262730f 100644 --- 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 defe162ffb..79ce693926 100644 --- 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 c7ab4a6669..b05d176a12 100644 --- 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 4560edc488..561b3ca0ba 100644 --- 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 ccd622c2db..d722817bb8 100644 --- 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 ec95c9aa6c..e528dfc985 100644 --- 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 65dcb3c3ff..7649a8e136 100644 --- 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 4980981e94..542012af60 100644 --- 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 0d28088029..20ea631c0a 100644 --- 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 56a4c59ff3..00565bf7cc 100644 --- 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 850695a7a5..4eedb749cc 100644 --- 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 4bd54e24a9..ed2fbd6ddf 100644 --- 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 28ba0e6cd2..4fd861d71f 100644 --- 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 e50d203a12..16654635f6 100644 --- 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 2f7a263b96..215105f4b4 100644 --- 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 f77ee063c1..bbc20d9d10 100644 --- 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 45990768d0..dcaeb51492 100644 --- 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 0c4a786a4c..96df72550d 100644 --- 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 247d98cd48..09fef37135 100644 --- 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 bc85b013df..8315a73105 100644 --- 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--}: - +