More language strings rewritten

diff --git a/inc/filters.php b/inc/filters.php
index f479861e71529c60c960fe529a2e7fd4aad5e798..f289810b5312d86a5488741cff69bbdaa1232905 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -144,7 +144,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        if ((isset($filters[$filterName][$filterFunction])) && (!$force)) {
                // Then abort here
                if (!$silentAbort) {
-                       addFatalMessage(sprintf(getMessage('FILTER_FAILED_ALREADY_ADDED'), $filterFunction, $filterName));
+                       addFatalMessage(getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
                } // END - if
 
                // Abort here
@@ -154,7 +154,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        // Is the function there?
        if (!function_exists($filterFunction)) {
                // Then abort here
-               addFatalMessage(sprintf(getMessage('FILTER_FAILED_NOT_FOUND'), $filterFunction, $filterName));
+               addFatalMessage(getMessage('FILTER_FAILED_NOT_FOUND'), array($filterFunction, $filterName));
                return false;
        } // END - if
 
@@ -178,7 +178,7 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r
        // Is that filter there?
        if ((!isset($filters[$filterName][$filterFunction])) && (!$force)) {
                // Not found, so abort here
-               addFatalMessage(sprintf(getMessage('FILTER_FAILED_NOT_REMOVED'), $filterFunction, $filterName));
+               addFatalMessage(getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName));
                return false;
        } // END - if
 
@@ -199,7 +199,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
                // Then abort here (quick'N'dirty hack)
                if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
                        // Add fatal message
-                       addFatalMessage(sprintf(getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName));
+                       addFatalMessage(getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
                } // END - if
 
                // Abort here
@@ -251,7 +251,7 @@ function FILTER_FLUSH_FILTERS () {
        // Is a database link here and not in installation mode?
        if ((!is_resource($link)) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
                // Abort here
-               addFatalMessage(sprintf(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'), $filterFunction, $filterName));
+               addFatalMessage(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'), array($filterFunction, $filterName));
                return false;
        } // END - if
 

diff --git a/inc/functions.php b/inc/functions.php
index 6fc7d1bd973a8ba0d198ba0ee07953477b315bee..ffdcd76a16eeb7907da966e0e3668550578750cd 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -185,15 +185,17 @@ function OUTPUT_RAW ($HTML) {
 function addFatalMessage ($message, $extra="") {
        global $FATAL;
 
-       if (empty($extra)) {
-               // Regular text message to add to $FATAL
-               $FATAL[] = $message;
-       } else {
+       if (is_array($extra)) {
+               // Multiple extras for a message with masks
+               $message = call_user_func_array('sprintf', $extra);
+       } elseif (!empty($extra)) {
                // $message is text with a mask plus extras to insert into the text
                $message = sprintf($message, $extra);
-               $FATAL[] = $message;
        }
 
+       // Add message to $FATAL
+       $FATAL[] = $message;
+
        // Log fatal messages away
        DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}");
 }
@@ -1599,7 +1601,7 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
                if ($aid == "-1") {
                        if (EXT_IS_ACTIVE("events")) {
                                // Add line to user events
-                               USERLOG_ADD_LINE($subj, $msg, $UID);
+                               EVENTS_ADD_LINE($subj, $msg, $UID);
                        } else {
                                // Log error for debug
                                DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
@@ -3270,7 +3272,7 @@ function GENERATE_AID_LINK ($aid) {
                        }
                } else {
                        // Maybe deleted?
-                       $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$aid.ADMIN_ID_404_2."</div>";
+                       $admin = "<div class=\"admin_note\">".sprintf(getMessage('ADMIN_ID_404'), $aid)."</div>";
                }
        } // END - if
 

diff --git a/inc/language/admins_de.php b/inc/language/admins_de.php
index 7afc3a62ce039c35e2de148de4e80bc0f81992ec..24b621e346aaaa9b19248e4316e497c59b8ac61a 100644 (file)
--- a/inc/language/admins_de.php
+++ b/inc/language/admins_de.php
@@ -91,7 +91,7 @@ define('ADMINS_MAILS_NO_ENTRIES', "Keine Einträge gefunden!");
 define('ADMINS_MAILS_TITLE', "Admins-Mails verwalten");
 define('ADMIN_ADMINS_TEMPLATE', "Mail-Template");
 define('ADMINS_ALL_ADMINS', "An alle Admins");
-define('ADMINS_TO_USERLOG', "Im Userlog vermerken");
+define('ADMINS_TO_USER_EVENTS', "Im Userlog vermerken");
 define('ADMINS_NO_MAIL_CHECKED', "Keine Mails zum Editieren ausgewählt.");
 define('ADMINS_MAILS_EDIT_TITLE', "Ausgewählte Templates den Admins zuweisen");
 define('ADMIN_ADMINS_CHANGE', "Ändern");

diff --git a/inc/language/de.php b/inc/language/de.php
index 3c2d2d2b3becfbc695c9e05d74a85925066067ba..fb49fbe18f363a423252359cb16425aa8205ff13 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -58,9 +58,7 @@ define('_OGESAMT', "KiloByte Gesamt optimiert");
 define('_WOPT', "wurde bereits optimiert");
 define('_OKOPT', "Optimiert!");
 define('LANG_DOWN_MAINTAINCE', "System wegen Wartungsarbeiten geschlossen!");
-define('LANG_MOD_REG_404_1', "Modul <u>");
-define('LANG_MOD_REG_404_2', "</u> existiert nicht!");
-define('LANG_MOD_NOT_REG', " ist nicht registriert!");
+define('LANG_MOD_REG_404', "Modul <u>%s</u> existiert nicht!");
 define('LANG_UNKNOWN_MODULE', "Unbekanntes Modul");
 define('META_YOUR_NAME_1', "Ihr Name hier");
 define('META_YOUR_NAME_2', "Ihr Name nochmal");
@@ -92,14 +90,8 @@ define('FATAL_INC_WRITABLE', "Das Verzeichnis inc ist beschreibbar! Bitte setzen
 define('LANG_WRITE_FOOTER', "Scriptname, -version und -author anzeigen?");
 define('LANG_FRAMESET_ACTIVE', "Soll das Frameset aktiviert werden? (Wenn nein wird ein Table-Set aktiviert)");
 define('MYSQL_ERRORS', "Es sind MySQL-Fehler aufgetreten! Bitte korregieren Sie diese!");
-define('LANG_MOD_REG_UNKNOWN_1', "Der Return-Code <u>");
-define('LANG_MOD_REG_UNKNOWN_2', "</u> ist unbekannt!");
-define('LANG_MOD_REG_LOCKED_1', "Das Modul <u>");
-define('LANG_MOD_REG_LOCKED_2', "</u> wurde gesperrt!");
-define('ADMIN_UNKNOWN_ACTION_1', "Unbekannte Admin-Aktion <u>");
-define('ADMIN_UNKNOWN_ACTION_2', "</u> erkannt! Bitte das Modul richtig aufrufen!");
-define('ADMIN_ACTION_404_1', "Admin-Modul f&uuml;r Aktion <u>");
-define('ADMIN_ACTION_404_2', "</u> nicht gefunden!");
+define('LANG_MOD_REG_UNKNOWN', "Der Return-Code <u>%s</u> ist unbekannt!");
+define('LANG_MOD_REG_LOCKED', "Das Modul <u>%s</u> wurde gesperrt!");
 define('ADMIN_NOT_REGISTERED', "Es ist noch kein Administrator-Account angelegt worden.");
 define('ADMIN_REGISTER_NOW', "Legen Sie jetzt das Administrator-Account an:");
 define('ADMIN_LOGIN', "Geben Sie ein Administrator-Login ein");
@@ -133,9 +125,7 @@ define('TIMEOUT_FULL_YEAR', "1 Jahr");
 define('ADMIN_LOGOUT_DONE', "Ausloggen aus dem Admin-Bereich abgeschlossen!");
 define('ADMIN_LOGOUT_FAILED', "Konnte nicht aus dem Admin-Bereich ausloggen! :-(");
 define('ADMIN_RELOGIN_LINK', "Klicken Sie hier, um sich erneut einzuloggen.");
-define('ADMIN_404_ACTION', "Admin-Modul nicht gefunden!");
-define('ADMIN_404_ACTION_1', "Das aufgerufe Admin-Modul <u>");
-define('ADMIN_404_ACTION_2', "</u> ist zwar g&uuml;ltig, konnte aber nicht auf dem Server gefunden werden.");
+define('ADMIN_ACTION_404', "Das aufgerufe Admin-Modul <u>%s</u> ist zwar g&uuml;ltig, konnte aber nicht auf dem Server gefunden werden.");
 define('ALREADY_INSTALLED', "Dieses Script ist bereits auf diesem Server installiert worden Bitte l&ouml;schen Sie install.php inc/install-inc.php und install.sql von Ihrem Server! (Keine Sorge, Sie k&ouml;nnen es tun...)");
 define('ADMIN_MAIN_TITLE', "Willkommen zum Administrationsbereich");
 define('YOU_ARE_HERE', "Sie sind hier:");
@@ -234,9 +224,7 @@ define('MIN_PASS_LENGTH', "Minimale Passwortl&auml;nge");
 define('SETTINGS_NOT_SAVED', "Einstellungen NICHT gespeichert / ge&auml;ndert!");
 define('SETTINGS_SAVED', "Einstellungen gespeichert.");
 define('FATAL_CANNOT_LOAD_CONFIG', "Kann die Konfigurationsdaten nicht laden! Vermutlich richtet der Webmaster diesen {!MT_WORD2!} gerade das Script erst ein! Bitte schauen Sie sp&auml;ter noch einmal vorbei!");
-define('ADMIN_INVALID_ACTION', "Ung&uuml;ltige action/what-Kombination erkannt! Bitte rufen Sie das Admin-Men&uuml; richtig auf!");
-define('ADMIN_INVALID_ACTION_1', "Die action/what-Kombination <u>");
-define('ADMIN_INVALID_ACTION_2', "</u> ist ung&uuml;ltig!");
+define('ADMIN_ACTION_INVALID', "Die action/what-Kombination <u>%s</u> ist ung&uuml;ltig!");
 define('SHORT_PASS', "Das eingegebene Passwort ist nach unseren Sicherheitseinstellungen zu kurz. Mindestl&auml;nge ist");
 define('EDIT_POINTS_SETTINGS', "&Auml;ndern der Willkommensgutschrift und anderer {!POINTS!}");
 define('POINTS_REGISTER', "Willkommensgutschrift");
@@ -641,19 +629,15 @@ define('ADMIN_MEM_NO_CATS_1', "Das Mitglied <u>");
 define('ADMIN_MEM_NO_CATS_2', "</u> hat keine Kategorien ausgew&auml;hlt!");
 define('USER_ID', "Mitglied");
 define('UNCONFIRMED_LINKS', "Unbest&auml;tigte Mails");
-define('ADMIN_MEMBER_LINKS_1', "Das Mitglied <u>");
-define('ADMIN_MEMBER_LINKS_2', "</u> hat alle seine Mails best&auml;tigt.");
+define('ADMIN_MEMBER_LINKS', "Das Mitglied <u>%s</u> hat alle seine Mails best&auml;tigt.");
 define('MEMBER_TOTAL_LINKS_1', "Es m&uuml;ssen noch <strong>");
 define('MEMBER_TOTAL_LINKS_2', "</strong> Mails von diesem Mitglied best&auml;tigt werden!");
 define('ADMIN_DEL_UNCONFIRMED_LINKS', "Alle unbest&auml;tigten Mails l&ouml;schen");
 define('ADMIN_LINKS_DELETED', "Links f&uuml;r unbest&auml;tigte Mails wurden gel&ouml;scht!");
 define('ADMIN_DEL_LINK_SUBJ', "Ihr unbestaetigen Mails wurden geloescht!");
-define('MEMBER_LINKS_LEFT_1', "Sie haben <strong>");
-define('MEMBER_LINKS_LEFT_2', "</strong> unbest&auml;tigte Mails. Bitte best&auml;tigen Sie diese zuerst. Wenn Sie weniger als <strong>");
-define('MEMBER_LINKS_LEFT_3', "</strong> Mails im Account haben, k&ouml;nnen Sie auch wieder buchen.");
+define('MEMBER_LINKS_LEFT', "Sie haben <strong>%s</strong> unbest&auml;tigte Mails. Bitte best&auml;tigen Sie diese zuerst. Wenn Sie weniger als <strong>%s</strong> Mails im Account haben, k&ouml;nnen Sie auch wieder buchen.");
 define('TODAY', "Heute");
-define('MEMBER_PROFILE_LOCKED_1', "Sie k&ouml;nnen Ihren Account erst am <strong>");
-define('MEMBER_PROFILE_LOCKED_2', "</strong> wieder &auml;ndern!");
+define('MEMBER_PROFILE_LOCKED', "Sie k&ouml;nnen Ihren Account erst am <strong>%s</strong> wieder &auml;ndern!");
 define('MEMBER_HAS_ZERO_MMAILS', "Sie haben Ihren Empfang auf <strong>Urlaub</strong> stehen! Bitte stellen Sie unter &quot;Profildaten &auml;ndern&quot; den Empfang h&ouml;her ein!");
 define('REF_CLIX', "Clicks");
 define('REF_VIEWS', "Views");
@@ -676,10 +660,7 @@ define('ADMIN_DELETE_BONUS_MAIL', "Obrige Bonus-Mail l&ouml;schen");
 define('ADMIN_DELETE_NORMAL_MAIL', "Obrige Normal-Mail l&ouml;schen");
 define('ADMIN_REALLY_DELETE_ALL_MAILS', "Wollen Sie wirklich alle Mails l&ouml;schen?");
 define('SURNAME_FAMILY', "Vor- und Nachname");
-define('ADMIN_TOTAL_REFS_1', "Das Mitglied <strong>");
-define('ADMIN_TOTAL_REFS_2', "</strong> hat bereits <strong>");
-define('ADMIN_TOTAL_REFS_3', "</strong> weitere(s) Mitglied(er) geworben, davon sind <strong>");
-define('ADMIN_TOTAL_REFS_4', "</strong> gesperrt oder nicht best&auml;tigt!");
+define('ADMIN_USER_TOTAL_REFS', "Das Mitglied <strong>%s</strong> hat bereits <strong>%s</strong> weitere(s) Mitglied(er) geworben, davon sind <strong>%s</strong> gesperrt oder nicht best&auml;tigt!");
 define('REFS_COUNT', "Refs");
 define('MEMBER_JOINED', "Beigetreten");
 define('ADMIN_EMAIL_DELETED', "E-Mail wurde aus dem System gel&ouml;scht.");
@@ -695,14 +676,9 @@ define('_OTHERS', "Andere");
 define('_ALL2', "Alle");
 define('WE_HAVE', "Wir haben");
 define('MEMBER_TEST_URL', "Zur beworbenen Seite");
-define('ADMIN_LOGS_DIR_404_1', "Das Verzeichnis mit den Zugriffslogb&uuml;chern konnte nicht gefunden werden! (<strong>");
-define('ADMIN_LOGS_DIR_404_2', "</strong>) Vermutlich unterst&uuml;tzt Ihr Server dieses nicht.");
-define('ADMIN_USAGE_DIR_404_1', "Das Verzeichnis mit den Webalizer-Statistiken konnte nicht gefunden werden! (<strong>");
-define('ADMIN_USAGE_DIR_404_2', "</strong>) Vermutlich unterst&uuml;tzt Ihr Server dieses nicht.");
 define('ADMIN_ENTER_REDIRECT_URL', "URL eingeben, wenn abgelehnt werden soll");
 define('MEMBER_NO_REFBANNER_FOUND', "Es sind noch keine Werbebanner eingerichtet worden. Bitte verwende solange deinen Referal-Link.");
-define('ADMIN_ID_404_1', "ID <strong>");
-define('ADMIN_ID_404_2', "</strong> nicht gefunden!");
+define('ADMIN_ID_404_1', "ID <strong>%s</strong> nicht gefunden!");
 define('ADMIN_ASSIGNED_ADMIN', "Zugewiesener Admin-Login");
 define('ADMIN_MEMBER_UID', "ID des Mitgliedes");
 define('ADMIN_TASK_TYPE', "Aufgabenbereich");
@@ -898,10 +874,8 @@ define('ADMIN_UNKNOWN_FIELD_TYPE_2', "</strong> erkannt!");
 define('ADMIN_ADD_POINTS_TO_USER', "Einem Mitglied {!POINTS!} gutschreiben");
 define('MEMBER_ORDER_DELETED', "Ihre Mailbuchung wurde soeben geloescht");
 define('ADMIN_CALL_NOT_DIRECTLY', "Bitte diesen Men&uuml;punkt nicht direkt aufrufen!");
-define('ADMIN_UNCONFIRMED_POOL_MISSING_1', "Es fehlen Daten im Sende-Pool zur Mail-ID <u>");
-define('ADMIN_UNCONFIRMED_POOL_MISSING_2', "</u> !");
-define('ADMIN_UNCONFIRMED_STATS_MISSING_1', "Es fehlen Daten in der User-Statistik zur Mail-ID <u>");
-define('ADMIN_UNCONFIRMED_STATS_MISSING_2', "</u> !");
+define('ADMIN_UNCONFIRMED_POOL_MISSING', "Es fehlen Daten im Sende-Pool zur Mail-ID <u>%s</u> !");
+define('ADMIN_UNCONFIRMED_STATS_MISSING', "Es fehlen Daten in der User-Statistik zur Mail-ID <u>%s</u> !");
 define('ADMIN_UNCONFIRMED_INVALID_LINK', "Ung&uuml;tigen Link aufgerufen oder Mail ist nicht mehr vorhanden!");
 define('ADMIN_UNCONFIRMED_NO_LINK_LEFT', "Diese Mailbuchung wurde komplett best&auml;tigt!");
 define('ADMIN_CONFIG_REFMODE', "Soll die einmalige Referal-Gutschrift dem Werber alleine oder auch seinem Werber (usw.) gutgeschrieben werden?");
@@ -1074,10 +1048,6 @@ define('ADMIN_LINK_LOCK_USER_TITLE', "Mitglied sperren");
 define('ADMIN_LINK_UNLOCK_USER_TITLE', "Mitglied entsperren");
 define('ADMIN_LINK_ADD_POINTS_TITLE', "{!POINTS!} aufbuchen");
 define('ADMIN_LINK_SUB_POINTS_TITLE', "{!POINTS!} abziehen");
-define('LOGFILE_NOT_READABLE_1', "Das Logbuch <u>");
-define('LOGFILE_NOT_READABLE_2', "</u> konnte nicht geladen werden.");
-define('UNKNOWN_LOGFILE_FORMAT_1', "Das Logbuch <u>");
-define('UNKNOWN_LOGFILE_FORMAT_2', "</u> hat ein ung&uuml;ltiges oder nicht unterst&uuml;tztes Format.");
 define('MESSAGE_HEADER', "Hinweis");
 define('ADMIN_ALPHA_SELCTION', "Alphabetische Suche:");
 define('CATEGORY_NOT_SAVED', "Kategorie <u>%d</u> nicht gespeichert.");

diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php
index c7be819f9ac033e64b9ca1f6f9c3fca6e15a1a26..102aa8c699336da5b5a6391a48ebf5be7f63dbce 100644 (file)
--- a/inc/language/doubler_de.php
+++ b/inc/language/doubler_de.php
@@ -120,6 +120,7 @@ define('DOUBLER_FORM_NO_POINTS_LEFT', "Sie haben nicht ausreichend {!POINTS!} &u
 define('DOUBLER_MEMBER_SUBJECT', "Gutschrift durch Verdoppelung");
 define('DOUBLER_PAYOUT_TIME_DIRECT', "Die Auszahlung erfolgt unmittelbar, nachdem genügend {!POINTS!} zusammengekommen sind, um Ihnen die Verdoppelung auszuzahlen.");
 define('DOUBLER_PAYOUT_TIME_RESET', "Abends um 00:00 Uhr jeden Tages wird geprüft, ob genügend {!POINTS!} zusammengekommen sind, um Ihnen die Verdoppelung auszuzahlen.");
+define('DOUBLER_PAYOUT_TIME_UNKNOWN', "Unbebannter Modus <u>%s</u> erkannt. Bitte Bug melden.");
 define('DOUBLER_NO_ENTRIES_FOUND', "Keine Eintr&auml;ge gefunden!");
 define('DOUBLER_TIMEMARK', "Auszahlungstag");
 define('DOUBLER_GENERAL_INFOS', "Allgemeine Informationen zum Verdoppeln");

diff --git a/inc/language/en.php b/inc/language/en.php
index b59e0cf75a57bd21ee1683e49dd5360f71256115..f3bc65839f9838f805e1965424f54c8f62dd56c9 100644 (file)
--- a/inc/language/en.php
+++ b/inc/language/en.php
@@ -42,9 +42,7 @@ define('__LANG_ID', "English (US)");
 
 // Language definitions
 define('LANG_DOWN_MAINTAINCE', "System is down for maintenance.");
-define('LANG_MOD_REG_404_1', "Module <u>");
-define('LANG_MOD_REG_404_2', "</u> does not exists.");
-define('LANG_MOD_NOT_REG', " is not registered.");
+define('LANG_MOD_REG_404', "Module <u>%s</u> does not exists.");
 define('LANG_UNKNOWN_MODULE', "Unknown module");
 define('META_YOUR_NAME_1', "Your name here");
 define('META_YOUR_NAME_2', "Your name again");
@@ -97,14 +95,8 @@ define('FATAL_INC_WRITABLE', "Directory inc is writeable! Please set the access
 define('LANG_WRITE_FOOTER', "Display name, version and author of this script?");
 define('LANG_FRAMESET_ACTIVE', "Enable frameset? If not a table-set will be used instead.");
 define('MYSQL_ERRORS', "MySQL errors detected. Please correct first to continue.");
-define('LANG_MOD_REG_UNKNOWN_1', "Unknown return-code <u>");
-define('LANG_MOD_REG_UNKNOWN_2', "</u> detected!");
-define('LANG_MOD_REG_LOCKED_1', "Selected module <u>");
-define('LANG_MOD_REG_LOCKED_2', "</u> is locked!");
-define('ADMIN_UNKNOWN_ACTION_1', "Unknown administrator-action <u>");
-define('ADMIN_UNKNOWN_ACTION_2', "</u> detected. Please call this module correctly!");
-define('ADMIN_ACTION_404_1', "Administrator module for action <u>");
-define('ADMIN_ACTION_404_2', "</u> was not found on server.");
+define('LANG_MOD_REG_UNKNOWN', "Unknown return-code <u>%s</u> detected!");
+define('LANG_MOD_REG_LOCKED', "Selected module <u>%s</u> is locked!");
 define('ADMIN_NOT_REGISTERED', "There is no administrator account created so far.");
 define('ADMIN_REGISTER_NOW', "Please create an administrator account now:");
 define('ADMIN_LOGIN', "Enter administrator login");
@@ -138,9 +130,7 @@ define('TIMEOUT_FULL_YEAR', "1 Year");
 define('ADMIN_LOGOUT_DONE', "Logout from admin-account completed.");
 define('ADMIN_LOGOUT_FAILED', "Logout from admin-account failed! :-(");
 define('ADMIN_RELOGIN_LINK', "Click here to re-login again.");
-define('ADMIN_404_ACTION', "Admin-module not found!");
-define('ADMIN_404_ACTION_1', "Called admin-module <u>");
-define('ADMIN_404_ACTION_2', "</u> is well valid but it is not on this server.");
+define('ADMIN_ACTION_404', "Called admin-module <u>%s</u> is well valid but it is not on this server.");
 define('ALREADY_INSTALLED', "This script is already installed on this server. Please delete the whole installation system for your server. Don't worry you can do it...");
 define('ADMIN_MAIN_TITLE', "Welcome to the administration area");
 define('YOU_ARE_HERE', "You are here:");
@@ -239,9 +229,7 @@ define('MIN_PASS_LENGTH', "Minimum password length");
 define('SETTINGS_NOT_SAVED', "Settings are NOT saved/changed!");
 define('SETTINGS_SAVED', "Settings saved.");
 define('FATAL_CANNOT_LOAD_CONFIG', "Cannot load base configuration! a possible reason for this message is that the webmaster is setting up this mail exchange. Please come back later again.");
-define('ADMIN_INVALID_ACTION', "Invalid combination of action/what detected! Please click on Home to continue.");
-define('ADMIN_INVALID_ACTION_1', "Your combination action/what <u>");
-define('ADMIN_INVALID_ACTION_2', "</u> is invalid!");
+define('ADMIN_ACTION_INVALID', "Your combination action/what <u>%s</u> is invalid!");
 define('SHORT_PASS', "Your entered password is to short to match with our security conditions. Mimum length is");
 define('EDIT_POINTS_SETTINGS', "Edit welcome credit and other {!POINTS!}");
 define('POINTS_REGISTER', "Wecome credit");

diff --git a/inc/language/logs_de.php b/inc/language/logs_de.php
index d1714ecd52b68996285713ca35907970ce66d37f..a38e66d77fd9f6dcd4141f14710d23306023bf8b 100644 (file)
--- a/inc/language/logs_de.php
+++ b/inc/language/logs_de.php
@@ -38,12 +38,9 @@ if (!defined('__SECURITY')) {
 }
 
 // Language definitions
-define('ADMIN_LOGS_DIR_404_1', "Das Verzeichnis mit den Zugriffslogb&uuml;chern konnte nicht gefunden werden! (<strong>");
-define('ADMIN_LOGS_DIR_404_2', "</strong>) Vermutlich unterst&uuml;tzt Ihr Server dieses nicht.");
-define('LOGFILE_NOT_READABLE_1', "Das Logbuch <u>");
-define('LOGFILE_NOT_READABLE_2', "</u> konnte nicht geladen werden.");
-define('UNKNOWN_LOGFILE_FORMAT_1', "Das Logbuch <u>");
-define('UNKNOWN_LOGFILE_FORMAT_2', "</u> hat ein ung&uuml;ltiges oder nicht unterst&uuml;tztes Format.");
+define('ADMIN_LOGS_DIR_404', "Das Verzeichnis mit den Zugriffslogb&uuml;chern konnte nicht gefunden werden! (<u>%s</u>) Vermutlich unterst&uuml;tzt Ihr Server dieses nicht.");
+define('ADMIN_LOGFILE_NOT_READABLE', "Das Logbuch <u>%s</u> konnte nicht geladen werden.");
+define('ADMIN_UNKNOWN_LOGFILE_FORMAT', "Das Logbuch <u>%s</u> hat ein ung&uuml;ltiges oder nicht unterst&uuml;tztes Format.");
 
 //
 ?>

diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php
index 7065464bbfbf83e66f408cc11793b9e17a6f3fbb..4ce1bc227b8a6a5d1c810561c6d0877571d3baca 100644 (file)
--- a/inc/language/sponsor_de.php
+++ b/inc/language/sponsor_de.php
@@ -82,10 +82,8 @@ define('ACCOUNT_PENDING', "Wartend");
 define('ADMIN_LIST_SPONSOR_ACCOUNTS', "Alle Sponsoren auflisten");
 define('SPONSOR_POINTS_LEFT', "Restguthaben");
 define('ADMIN_LIST_SPONSOR_NOTES', "Klicken Sie auf die ID-Nummer, um weitere Details zu sehen und um weitere Aktionen am Sponsorenaccount durchführen zu können! Klicken Sie auf das Restguthaben an {!POINTS!}, um dem jeweiligen Sponsor mehr {!POINTS!} aufzubuchen.");
-define('ADMIN_SPONSOR_404_1', "Sponsorenaccount <u>");
-define('ADMIN_SPONSOR_404_2', "</u> nicht gefunden!");
-define('ADMIN_SPONSOR_REFS_404_1', "Der Sponsor <u>");
-define('ADMIN_SPONSOR_REFS_404_2', "</u> hat keine Referals!");
+define('ADMIN_SPONSOR_404', "Sponsorenaccount <u>%s</u> nicht gefunden!");
+define('ADMIN_SPONSOR_REFS_404', "Der Sponsor <u>%s</u> hat keine Referals!");
 define('ADMIN_SPONSOR_DETAILS', "Datenblatt eines Sponsors");
 define('ADMIN_SPONSOR_COMPANY_DATA', "Firmendaten des Sponsors");
 define('ADMIN_SPONSOR_PERSONA_DATA', "Pers&ouml;nliche Daten des Sponsors");
@@ -100,10 +98,8 @@ define('ADMIN_SPONSOR_ACTIONS', "Aktionen am Sponsorenaccount");
 define('SPONSOR_ID', "Sponsor-ID");
 define('SPONSOR_STATUS', "Sponsor-Status");
 define('SPONSOR_REFERRALS', "Sponsoren geworben");
-define('ADMIN_INVALID_MODE_1', "Ung&uuml;tiger Modus <u>");
-define('ADMIN_INVALID_MODE_2', "</u> angegeben!");
-define('ADMIN_TPL_404_1', "Modus-Template <u>");
-define('ADMIN_TPL_404_2', "</u> nicht gefunden!");
+define('ADMIN_SPONSOR_INVALID_MODE', "Ung&uuml;tiger Modus <u>%s</u> angegeben!");
+define('ADMIN_SPONSOR_MODUS_TPL_404', "Modus-Template <u>%s</u> nicht gefunden!");
 define('ADMIN_ADD_POINTS_TO_SPONSOR', "{!POINTS!} gutschreiben");
 define('ADMIN_SUB_POINTS_FROM_SPONSOR', "{!POINTS!} abziehen");
 define('ADMIN_SUM_SPONSOR_POINTS', "Summe {!POINTS!}");
@@ -118,8 +114,7 @@ define('ADMIN_HEADER_DEL_SPONSOR_1', "Sponsorenaccount <u>");
 define('ADMIN_HEADER_DEL_SPONSOR_2', "</u> l&ouml;schen");
 define('ADMIN_TEXT_DEL_SPONSOR_1', "M&ouml;chten Sie den Sponsoren <strong>");
 define('ADMIN_TEXT_DEL_SPONSOR_2', "</strong> mit samt aller seiner Bestellungen unwiederruflich l&ouml;schen?");
-define('SPONSOR_DELETED_1', "Sponsorenaccount <u>");
-define('SPONSOR_DELETED_2', "</u> entfernt.");
+define('ADMIN_SPONSOR_DELETED', "Sponsorenaccount <u>%s</u> entfernt.");
 define('GUEST_SPONSOR_TITLE', "Anmeldung als Sponsor");
 define('GUEST_SPONSOR_TEASER_1', "Melden Sie sich als Sponsor von <strong>{!MAIN_TITLE!}</strong> an! Hier bekommen Sie f&uuml;r Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!");
 define('GUEST_SPONSOR_TEASER_2', "Alles inklusiv: Ausf&uuml;hrliche Statistiken (auch per Mail im gew&uuml;nschten Zeitabstand) und einfache Verwaltung Ihrer {!POINTS!} mit nur wenigen Klicks!");
@@ -141,7 +136,7 @@ define('SPONSOR_ACCEPT_TERMS', "Ich/wir habe/n die [<strong><a href=\"{!URL!}/mo
 define('SPONSOR_TERMS_HEADER', "Allgemeine Gesch&auml;ftsbedingungen");
 
 // Add payment types
-define('SPONSOR_ADMIN_NO_PAYTYPES', "Noch keine Buchungspakete eingerichtet!");
+define('ADMIN_SPONSOR_NO_PAYTYPES', "Noch keine Buchungspakete eingerichtet!");
 define('ADMIN_ADD_SPONSOR_PAYTYPE_TITLE', "Neue Buchungspaket hinzuf&uuml;gen");
 define('ADMIN_ADD_SPONSOR_PAYTYPE', "Buchungspaket hinzuf&uuml;gen");
 define('SPONSOR_PAYTYPE_NAME', "Bezeichnung");
@@ -155,10 +150,10 @@ define('SPONSOR_PAYTYPE_NAME_NOTE', "Geben Sie eine passende Bezeichnung zum Buc
 define('SPONSOR_PAYTYPE_RATE_NOTE', "Wie viele {!POINTS!} soll der Sponsor f&uuml;r z.B. 1 &euro; bekommen?");
 define('SPONSOR_PAYTYPE_MIN_COUNT_NOTE', "Und wie oft soll dieses Buchungspaket <strong>mindestens</strong> eingekauft werden? (meistens einmal)");
 define('SPONSOR_PAYTYPE_CURRENCY_NOTE', "W&auml;hrung des Geldbetrages, die der Sponsor an Sie &uuml;berweisen soll.");
-define('SPONSOR_ADMIN_PAYTYPE_ALREADY_1', "Buchungspaket <u>");
-define('SPONSOR_ADMIN_PAYTYPE_ALREADY_2', "</u> bereits eingerichtet.");
-define('SPONSOR_ADMIN_PAYTYPE_ADDED_1', "Buchungspaket <u>");
-define('SPONSOR_ADMIN_PAYTYPE_ADDED_2', "</u> hinzugef&uuml;gt.");
+define('ADMIN_SPONSOR_PAYTYPE_ALREADY_1', "Buchungspaket <u>");
+define('ADMIN_SPONSOR_PAYTYPE_ALREADY_2', "</u> bereits eingerichtet.");
+define('ADMIN_SPONSOR_PAYTYPE_ADDED_1', "Buchungspaket <u>");
+define('ADMIN_SPONSOR_PAYTYPE_ADDED_2', "</u> hinzugef&uuml;gt.");
 define('SPONSOR_LIST_PAYMENT_TYPES_TITLE', "Buchungspakete auflisten, bearbeiten und l&ouml;schen");
 define('SPONSOR_PAYTYPE_MIN_COUNT2', "Minium");
 define('ADMIN_SPONSOR_PAYTYPE_EDIT', "Bearbeiten");
@@ -206,12 +201,12 @@ define('ADMIN_LIST_SPONSOR_ORDERS', "Bestellungen bearbeiten");
 
 // Subject lines
 define('SPONSOR_UNLOCKED_SUBJ', "Freischaltung Ihres Sponsorenaccounts");
-define('SPONSOR_ADMIN_ADD_POINTS', "Gutschrift durch den Admin!");
-define('SPONSOR_ADMIN_SUB_POINTS', "Abzug durch den Admin!");
+define('ADMIN_SPONSOR_ADD_POINTS', "Gutschrift durch den Admin!");
+define('ADMIN_SPONSOR_SUB_POINTS', "Abzug durch den Admin!");
 define('SPONSOR_SUBJECT_LOCKED', "HINWEIS: Sperrung Ihres Sponsorenaccounts!");
 define('SPONSOR_SUBJECT_UNLOCKED', "HINWEIS: Freigabe Ihres Sponsorenaccounts!");
-define('SPONSOR_ADMIN_EDIT_SUBJECT', "HINWEIS: Sponsorenaccount geaendert durch Admin!");
-define('SPONSOR_ADMIN_DEL_SUBJECT', "HINWEIS: Sponsorenaccount geloescht durch Admin!");
+define('ADMIN_SPONSOR_EDIT_SUBJECT', "HINWEIS: Sponsorenaccount geaendert durch Admin!");
+define('ADMIN_SPONSOR_DEL_SUBJECT', "HINWEIS: Sponsorenaccount geloescht durch Admin!");
 define('SPONSOR_PLEASE_CONFIRM_SUBJ', "HINWEIS: Bitte bestaetigen Sie Ihren Account!");
 define('SPONSOR_ACCOUNT_PENDING_SUBJ', "HINWEIS: Ihr Account warten auf Freischaltung!");
 define('ADMIN_NEW_SPONSOR', "Neue Anmeldung eines Sponsors");

diff --git a/inc/language/task_de.php b/inc/language/task_de.php
index b492bcaab56e7c19acff0247801570cda30d5497..b24dcdb1a61b3ed370826eac046313fe0242994a 100644 (file)
--- a/inc/language/task_de.php
+++ b/inc/language/task_de.php
@@ -58,8 +58,7 @@ define('TASK_ADMIN_MAIL_SEND', "Versendete Mails");
 define('TASK_ADMIN_MAIL_DELETED', "Bereinigte Mails");
 define('TASK_ADMIN_MAIL_BONUS_AP', "Bereinigte Bonus-Mails");
 define('TASK_ADMIN_MAIL_BONUS_SEND', "Versendete Bonus-Mails");
-define('TASK_ADMIN_UNKNOWN_MODE_1', "Unbekannter Modus <u>");
-define('TASK_ADMIN_UNKNOWN_MODE_2', "</u> erkannt!");
+define('ADMIN_TASK_UNKNOWN_MODE', "Unbekannter Modus <u>%s</u> erkannt!");
 define('ADMIN_OVERVIEW_TASK_YOUR_TYPE', "Ihre zugewiesen Aufgaben (ohne Updates)");
 define('ADMIN_OVERVIEW_TASK_UPDATES_TYPE', "Automatisch durchgef&uuml;hrte Updates");
 define('ADMIN_OVERVIEW_TASK_SOLVED_TYPE', "Ihre erledigten Aufgaben");
@@ -71,7 +70,6 @@ define('TASK_DELETE_MODE_NOTE', "Diese Aufgaben sind zum automatischen L&ouml;sc
 Die automatische L&ouml;schung erfolgt durch die autopurge-Erweiterung.<br />
 Sie k&ouml;nnen die Aufgaben aber auch jetzt endg&uuml;ltig l&ouml;schen!");
 define('TASK_ADMIN_UNKNOWN_LIST_TITLE', "Linktitel nicht gesetzt!");
-
 define('TASK_ADMIN_INACTIVE_AUTOPURGE', "Inaktive Accounts");
 define('TASK_ADMIN_INACTIVE_AUTOPURGE_TITLE', "Es gibt inaktiv gewordene Mitglieder in Ihrem {!MT_WORD!}!");
 define('TASK_ADMIN_LIST_PAYOUTS_WAITING', "Wart. Auszahlungen");

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 5d7c8f9a1718018e83307b7e27b2342803f39f1a..87b924d5dce809a40bcdbdde20a159b795563f81 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -247,7 +247,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
        } else {
                // Log invalid request
                DEBUG_LOG(__FUNCTION__, __LINE__, " action={$formData['action']},id={$formData['id']},function={$functionName}");
-               addFatalMessage(sprintf("Invalid member action! action=%s,id=%s,function=%s", $formData['action'], $formData['id'], $functionName));
+               addFatalMessage("Invalid member action! action=%s,id=%s,function=%s", array($formData['action'], $formData['id'], $functionName));
        }
 
        // Return status
@@ -407,7 +407,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
                } // END - if
        } else {
                // Not found!
-               addFatalMessage(sprintf(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName));
+               addFatalMessage(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName);
        }
 
        // Return status

diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php
index 69eaf11bc28055a3cce13c9d1ea1dc34d7b4333d..85685d1bafca65a0e2fb04e66d8f96bc7342c191 100644 (file)
--- a/inc/modules/admin/action-admins.php
+++ b/inc/modules/admin/action-admins.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-bank.php b/inc/modules/admin/action-bank.php
index 2247dfdb83f54476012010b6f4868f2ef11eeede..3c41577b5306acd0ca41ad7da9f3d0778e48284d 100644 (file)
--- a/inc/modules/admin/action-bank.php
+++ b/inc/modules/admin/action-bank.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index 572b5a83db154626b98aecedd87910ab8bf73d5e..d9511b39dc0a11cf1bc77e6f08231a8b60eca9f2 100644 (file)
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php
index ec9c8cf303f92bca1bd3446aae058f847d06aa2f..08cfc5f29c7d40628b8d0c79b8497582a6e28a89 100644 (file)
--- a/inc/modules/admin/action-doubler.php
+++ b/inc/modules/admin/action-doubler.php
@@ -47,7 +47,7 @@ if (FILE_READABLE($INC)) {
        LOAD_INC($INC);
 } else {
        // "what file" not found
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index 303a8583932644e4825188fd031e180ec2317e50..ca1f750f4c022e56b6f165d9e724bf9e40c9001a 100644 (file)
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index dcdc7e38dfe0adfc75d83c3304ca7b44455cd2ff..2cdec1e99f8a4445fe7adc227a4ac34b9b7796e3 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php
index cc980cf9b74e81d37c7f747e3cfb608e106f3e20..5e4d6eba0204c0a9449d1b428adf26f81dc2470a 100644 (file)
--- a/inc/modules/admin/action-login.php
+++ b/inc/modules/admin/action-login.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php
index eec930c8ea834e50c1a1ad4eb3588653234eeaef..bc860f3d6c94269e0e04dbc04c0ec63575dead2f 100644 (file)
--- a/inc/modules/admin/action-menu.php
+++ b/inc/modules/admin/action-menu.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index 6f6b74abfc20af03da4b967078415c760c9d8404..81e5691207c7299d1cd28c48d6538d91ec312139 100644 (file)
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php
index a0ecec34ec7b67dde2cf93a8d337248e00cc3e08..3d523770d40d47be684980c3289a8255f0b9909b 100644 (file)
--- a/inc/modules/admin/action-mods.php
+++ b/inc/modules/admin/action-mods.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php
index eae1d188f896f37fe2c5bdbeab72767bf3372b28..658d6089a26166e1ae213d53df63a32328c0c2aa 100644 (file)
--- a/inc/modules/admin/action-newsletter.php
+++ b/inc/modules/admin/action-newsletter.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php
index 29af4346679def7250f27377d2e9354b6e8918f5..5b9c3c0779d4b24d466af0ca30f00bd216966fa9 100644 (file)
--- a/inc/modules/admin/action-payouts.php
+++ b/inc/modules/admin/action-payouts.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-primera.php b/inc/modules/admin/action-primera.php
index 48bc6cc5fcf27f2464fffa00c6e2ad9bfbfaf5d8..870416adf445fbff6894b9650d845e376c02144f 100644 (file)
--- a/inc/modules/admin/action-primera.php
+++ b/inc/modules/admin/action-primera.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php
index 9b7df7e7d149c6f049669257cb1cbf99adac8ac8..f0719b7fb7e309d1772b4812f1226dc9a14ecfac 100644 (file)
--- a/inc/modules/admin/action-rallye.php
+++ b/inc/modules/admin/action-rallye.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php
index f94fd846efe74faefe89e2dfce6f32960a0dcfb3..d6fc98d3cf1c114d1229c5db2fc9cb25100991bc 100644 (file)
--- a/inc/modules/admin/action-repair.php
+++ b/inc/modules/admin/action-repair.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php
index d2cb9c50c94f91d3310a8607946c3095b42a07d3..de7d1a4455807582415e2b8b61ebf9093707899c 100644 (file)
--- a/inc/modules/admin/action-setup.php
+++ b/inc/modules/admin/action-setup.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php
index b9452b79586a9b73c3aa1fac8b0842860532c505..8eabf8819678e0b69e1d79d6fefabf7418dab8aa 100644 (file)
--- a/inc/modules/admin/action-sponsor.php
+++ b/inc/modules/admin/action-sponsor.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 //
 ?>

diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php
index 4100288347a46fd5441b29da335635cbedab4903..9615d3654f2279c3955ca59fd1d409f5308a9c69 100644 (file)
--- a/inc/modules/admin/action-stats.php
+++ b/inc/modules/admin/action-stats.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-surfbar.php b/inc/modules/admin/action-surfbar.php
index 9b721fe3963846ac979865d98ef4946e417424d7..90b42463c3797f1967fd9cbbb55049fce960b433 100644 (file)
--- a/inc/modules/admin/action-surfbar.php
+++ b/inc/modules/admin/action-surfbar.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 3aa5af429681d5c9e6c6a1a42a72c4f3a40da89a..cbbd29c4eda692623dca9b7d75eac6767466424d 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -49,7 +49,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php
index d1e14ad33be7826e8c6e098cc141ed49cf920e02..05cc6dd7a62eed21d7974e922ce8e0d3bf4755a0 100644 (file)
--- a/inc/modules/admin/action-theme.php
+++ b/inc/modules/admin/action-theme.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php
index 8175c2f86eddd3754a58f1b9632f52fa6f7983c4..048c8e35297a697c2795351be102fd99345dd688 100644 (file)
--- a/inc/modules/admin/action-transfer.php
+++ b/inc/modules/admin/action-transfer.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php
index cdc524036e89412c770109488f1d3750c5a7026d..a882e5445e7937f909afa6fb64d9aed74e0e49da 100644 (file)
--- a/inc/modules/admin/action-user.php
+++ b/inc/modules/admin/action-user.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php
index 4957c8f847b084d7f5dfd1fa48d673a5a5047a0c..3e323131e708f17a7e6a0e58c138a32b15635d1f 100644 (file)
--- a/inc/modules/admin/action-wernis.php
+++ b/inc/modules/admin/action-wernis.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 50174c2379e853b370a5e238ce81f7d0dd13ad00..2850f95bfad52f1d462ef660ba344c33cf9e224c 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -359,13 +359,13 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                        addFatalMessage(getMessage('ADMIN_ACCESS_DENIED'));
                } else {
                        // Include file not found! :-(
-                       LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_404_ACTION'));
-                       addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
+                       LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act));
+                       addFatalMessage(getMessage('ADMIN_ACTION_404'), $act);
                }
        } else {
                // Invalid action/what pair found!
-               LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_INVALID_ACTION'));
-               addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
+               LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht));
+               addFatalMessage(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht);
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index cf783511a82ca02ed4302b0bc630d2dba36fd39f..3dc99e4a3e2ec62862831795bbce4ccdf621c65d 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -114,7 +114,7 @@ if ($_GET['u_id'] == "all") {
                }
        } else {
                // User not found!
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 3305017e372963fb8468f7a29077bdce6a4e2a6e..1c56e964699cc64e4933b3d345f8b609abb57b64 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -63,7 +63,7 @@ if (isset($_POST['edit']))
                                if (EXT_IS_ACTIVE("events")) {
                                        $OUT .= "<option value=\"-1\"";
                                        if ($aid == "-1") $OUT .= " selected=\"selected\"";
-                                       $OUT .= ">{--ADMINS_TO_USERLOG--}</option>\n";
+                                       $OUT .= ">{--ADMINS_TO_USER_EVENTS--}</option>\n";
                                }
                                $OUT .= ADD_OPTION_LINES("admins", "id", "login", $aid, "email");
                                $OUT .= "</select><br />\n";

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index fb7df510b6c1d13e30a8c425f5446d300e9d2540..51b98f72e9f93f6423732025c7073f44fe5b5f75 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -60,7 +60,7 @@ if (!empty($_GET['id'])) {
 
                        // Prepare message and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("del_sponsor", $_POST['reason'], bigintval($_GET['id']));
-                       SEND_EMAIL($email, getMessage('SPONSOR_ADMIN_DEL_SUBJECT'), $msg);
+                       SEND_EMAIL($email, getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $msg);
 
                        // Remove account
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
@@ -71,7 +71,7 @@ if (!empty($_GET['id'])) {
                                array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                        // Output message
-                       LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_DELETED_1.bigintval($_GET['id']).SPONSOR_DELETED_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_DELETED'), bigintval($_GET['id'])));
                } elseif (!empty($_POST['no'])) {
                        // Do not delete him...
                        LOAD_URL("modules.php?module=admin&what=list_sponsor&id=".bigintval($_GET['id']));
@@ -91,7 +91,7 @@ if (!empty($_GET['id'])) {
                }
        } else {
                // Sponsor not found!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_404_1.bigintval($_GET['id']).ADMIN_SPONSOR_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval($_GET['id'])));
        }
 } else {
        // Not called by what-list_sponsor.php

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index f3b27c75ff65e2960bd3dbe3ff7dc8240c51f357..c7a798a57c95a947067946b3be6771c77fde48ca 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -54,7 +54,7 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason']
                LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".ADMIN_DEL_COMPLETED."</div>");
        } else {
                // Account does not exists!
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
        }
 } elseif (!empty($_POST['no'])) {
        // Do not delete him...
@@ -81,7 +81,7 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason']
                LOAD_TEMPLATE("admin_del_user");
        } else {
                // Account does not exists!
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
        }
 }
 

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index dd3d722dba92e52683a0c031c615f61f873a5fbb..4b448b2546712220b066ffdc7247a759b8c5d594 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -118,7 +118,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
 
                                        // Send email
                                        $msg = LOAD_EMAIL_TEMPLATE("sponsor_add_points", $_POST['reason'], true);
-                                       SEND_EMAIL(__EMAIL, SPONSOR_ADMIN_ADD_POINTS, $msg);
+                                       SEND_EMAIL(__EMAIL, ADMIN_SPONSOR_ADD_POINTS, $msg);
                                        $MSG = ADMIN_SPONSOR_POINTS_ADDED;
                                } else {
                                        // No points entered to add!
@@ -141,7 +141,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
 
                                        // Send email
                                        $msg = LOAD_EMAIL_TEMPLATE("sponsor_sub_points", $_POST['reason'], true);
-                                       SEND_EMAIL(__EMAIL, SPONSOR_ADMIN_SUB_POINTS, $msg);
+                                       SEND_EMAIL(__EMAIL, ADMIN_SPONSOR_SUB_POINTS, $msg);
                                        $MSG = ADMIN_SPONSOR_POINTS_SUBTRACTED;
                                } else {
                                        // No points entered to add!
@@ -172,12 +172,12 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
 
                                // Load email template and send the mail away
                                $msg = LOAD_EMAIL_TEMPLATE("admin_sponsor_edit", $_POST, false);
-                               SEND_EMAIL($_POST['email'], SPONSOR_ADMIN_EDIT_SUBJECT, $msg);
+                               SEND_EMAIL($_POST['email'], ADMIN_SPONSOR_EDIT_SUBJECT, $msg);
                                break;
 
                        default: // Unknown mode
                                DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mode %s detected.", $_GET['mode']));
-                               $MSG = ADMIN_INVALID_MODE_1.SQL_ESCAPE($_GET['mode']).ADMIN_INVALID_MODE_2;
+                               $MSG = sprintf(getMessage('ADMIN_SPONSOR_INVALID_MODE'), SQL_ESCAPE($_GET['mode']));
                                break;
                        }
 
@@ -193,11 +193,11 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                        LOAD_TEMPLATE($TPL);
                } else {
                        // Template not found!
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_TPL_404_1.SQL_ESCAPE($_GET['mode']).ADMIN_TPL_404_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_MODUS_TPL_404'), SQL_ESCAPE($_GET['mode'])));
                }
        } else {
                // Sponsor not found!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_404_1.bigintval($_GET['id']).ADMIN_SPONSOR_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval($_GET['id'])));
        }
 } else {
        // Not called by what-list_sponsor.php

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index f3d58632667a2c336cc8e16451ad628f085e7f56..726707009f722baf5276923776ed5643758f75f5 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -145,11 +145,9 @@ WHERE userid=%s LIMIT 1",
                // Load template
                LOAD_TEMPLATE("admin_edit_user", false, bigintval($_GET['u_id']));
        }
-}
- else
-{
+} else {
        // Account does not exists!
-       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
+       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
 }
 
 //

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 813156de9dcd411c4ceab41354e2670d6f5a9b33..7d6556fc90c3233c26bfd6c501f16ac893ffeb20 100644 (file)
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -96,7 +96,7 @@ if (!empty($_GET['u_id'])) {
                }
        } else {
                // User not found
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.__UID.ADMIN_MEMBER_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), constant('__UID')));
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index fcf1a4ec92d875eaf6fd8c379b5a5ddfb80fdc3e..0045d149130dabd3cdc8501714cbb97ab4610b38 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -162,11 +162,11 @@ if (!empty($_GET['u_id'])) {
                        }
                } else {
                        // No mails left to confirm
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_LINKS_1.$_GET['u_id'].ADMIN_MEMBER_LINKS_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_LINKS'), $_GET['u_id']));
                }
        } else {
                // User not found
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id']));
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php
index 02431f9d58f1dde3b2b3ac4029a1219029af97c5..6803a04aecbc5cd3f4a4eabb21d763b55e44b593 100644 (file)
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -81,7 +81,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                                array($uid), __FILE__, __LINE__);
 
                        // Output info message
-                       OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<br /><br />");
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_USER_TOTAL_REFS'), ADMIN_USER_PROFILE_LINK($_GET['u_id']), $menge, $menge_lck));
                }
 
                // Are there some levels (VERY BAD IF NONE!)
@@ -114,7 +114,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                                                SQL_FREERESULT($result_lck);
 
                                                // Output info message
-                                               $levels['info'] = ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($uid)."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4;
+                                               $levels['info'] = sprintf(getMessage('ADMIN_USER_TOTAL_REFS'), ADMIN_USER_PROFILE_LINK($uid), $menge, $menge_lck);
 
                                                // Load all refs
                                                $OUT_REFS = ""; $SW = 2;
@@ -172,7 +172,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                                                } // END - while
                                        } else {
                                                // Output info message
-                                               $levels['info'] = ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($uid)."".ADMIN_TOTAL_REFS_2."0".ADMIN_TOTAL_REFS_3."0".ADMIN_TOTAL_REFS_4;
+                                               $levels['info'] = sprintf(getMessage('ADMIN_USER_TOTAL_REFS'), ADMIN_USER_PROFILE_LINK($uid), "0", "0");
 
                                                // No refs found
                                                $levels['rows'] = LOAD_TEMPLATE("admin_list_refs_norefs", true, array('uid' => $uid));
@@ -238,7 +238,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                SQL_FREERESULT($result_levels);
        } else {
                // User not found
-               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_MEMBER_404, $_GET['u_id']));
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id']));
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 55d8a954dbb22737c95ec1ed795ff14b163e78ca..fa00a1cc30ee6040504f436788aa2a00a66a0c04 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -109,7 +109,7 @@ WHERE id='%s' LIMIT 1",
                LOAD_TEMPLATE("admin_list_sponsor_details");
        } else {
                // Sponsor not found
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_404_1.$_GET['id'].ADMIN_SPONSOR_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_404'), $_GET['id']));
        }
 } elseif (!empty($_GET['rid'])) {
        // Search for sponsor
@@ -131,11 +131,11 @@ WHERE refid='%s' ORDER BY `id`",
                        SQL_FREERESULT($result);
                } else {
                        // No refs made so far
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_REFS_404_1."<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['rid'])."\">".bigintval($_GET['rid'])."</a>".ADMIN_SPONSOR_REFS_404_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_REFS_404'), "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['rid'])."\">".bigintval($_GET['rid'])."</a>"));
                }
        } else {
                // Sponsor not found
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_404_1.bigintval($_GET['rid']).ADMIN_SPONSOR_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval($_GET['rid'])));
        }
 } else {
        // List all sponsors

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index 32dfa7dd037e5d92480305bff07c20ecbeb0e56d..9e1033bc7043218fe39a3df6b472f67b9840cf0d 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -102,13 +102,13 @@ if (isset($_POST['add'])) {
  __FILE__, __LINE__);
 
                // Payment type added!
-               $MSG = SPONSOR_ADMIN_PAYTYPE_ADDED_1.$_POST['pay_name'].SPONSOR_ADMIN_PAYTYPE_ADDED_2;
+               $MSG = ADMIN_SPONSOR_PAYTYPE_ADDED_1.$_POST['pay_name'].ADMIN_SPONSOR_PAYTYPE_ADDED_2;
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Entry does already exists
-               $MSG = SPONSOR_ADMIN_PAYTYPE_ALREADY_1.$_POST['pay_name'].SPONSOR_ADMIN_PAYTYPE_ALREADY_2;
+               $MSG = ADMIN_SPONSOR_PAYTYPE_ALREADY_1.$_POST['pay_name'].ADMIN_SPONSOR_PAYTYPE_ALREADY_2;
        }
 
        // Output message
@@ -201,7 +201,7 @@ if (isset($_POST['add'])) {
                define('__LIST_CONTENT', LOAD_TEMPLATE("admin_list_sponsor_pay", true));
        } else {
                // Noting setup so far!
-               define('__LIST_CONTENT', LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_ADMIN_NO_PAYTYPES));
+               define('__LIST_CONTENT', LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_SPONSOR_NO_PAYTYPES));
        }
 
        // Add new payment types here

diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php
index c5ff14875383e57f38ba62bb0880c8fe55d1a976..47a4531ecf57e385be3f15e2919d60c2795e16e5 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pays.php
+++ b/inc/modules/admin/what-list_sponsor_pays.php
@@ -50,7 +50,7 @@ if (!empty($_GET['id'])) {
                SQL_FREERESULT($result);
        } else {
                // Sponsor not found!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_404_1.bigintval($_GET['id']).ADMIN_SPONSOR_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval($_GET['id'])));
        }
 } else {
        // Not called by what-list_sponsor.php

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 5223164e6b7a7d42b5858bdda811069b4e1e5460..493903850cc995609536a3e7f0a03749e39f58c1 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -74,7 +74,7 @@ case "closed": // List all closed
 
 default: // Unknown type
        DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $_GET['type']));
-       LOAD_TEMPLATE("admin_settings_saved", false, TASK_ADMIN_UNKNOWN_MODE_1.$_GET['type'].TASK_ADMIN_UNKNOWN_MODE_2);
+       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), $_GET['type']));
        break;
 }
 

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 1787b6f75d230cd7cac37bdffddaa8ecb76b394e..0c46cbe3fc47bb2ceec5a710de53d9ce084dbc69 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -151,10 +151,10 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                        array(bigintval($ID)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result1) == 1) {
                        // pool table
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_POOL_MISSING_1.$ID.ADMIN_UNCONFIRMED_POOL_MISSING_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID)));
                } elseif (SQL_NUMROWS($result2) == 1) {
                        // user_stats table
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_STATS_MISSING_1.$ID.ADMIN_UNCONFIRMED_STATS_MISSING_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID)));
                } else {
                        // both or link is invalid
                        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 7560ac483dee650f7c8484405cdb85a74c17c8ee..d3020a6a0a26c6c38342ac557c7e05eb2149b9f0 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -190,7 +190,7 @@ LIMIT 1",
                LOAD_TEMPLATE("admin_user_details", false, $uid);
        } else {
                // Account does not exist!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.$uid.ADMIN_MEMBER_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), $uid));
        }
 
        // Free the result

diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index 1fbb82598147d1fe2c9383c1b78ea9b5bbed5d03..bed365337a921d712567c148ac3ffbf202a3ace3 100644 (file)
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -61,13 +61,13 @@ if (!empty($_GET['id'])) {
                                // Create messages
                                if ($status == "CONFIRMED") {
                                        // Message when sponsor's account got lock
-                                       define('__EMAIL_MSG', SPONSOR_ACCOUNT_LOCKED);
-                                       $subject = SPONSOR_SUBJECT_LOCKED;
+                                       define('__EMAIL_MSG', getMessage('SPONSOR_ACCOUNT_LOCKED'));
+                                       $subject = getMessage('SPONSOR_SUBJECT_LOCKED');
                                        $status = "LOCKED";
                                } else {
                                        // Message when sponsor's account got unlock
-                                       define('__EMAIL_MSG', SPONSOR_ACCOUNT_UNLOCKED);
-                                       $subject = SPONSOR_SUBJECT_UNLOCKED;
+                                       define('__EMAIL_MSG', getMessage('SPONSOR_ACCOUNT_UNLOCKED'));
+                                       $subject = getMessage('SPONSOR_SUBJECT_UNLOCKED');
                                        $status = "CONFIRMED";
                                }
 
@@ -87,36 +87,37 @@ if (!empty($_GET['id'])) {
                                // Create header and text messages
                                if ($status == "CONFIRMED") {
                                        // Messages when sponsor's account is confirmed
-                                       define('__HEADER_MESSAGE', SPONSOR_LOCK_SPONSOR_HEADER);
-                                       define('__TEXT_MESSAGE'  , SPONSOR_LOCK_SPONSOR_TEXT);
+                                       define('__HEADER_MESSAGE', getMessage('SPONSOR_LOCK_SPONSOR_HEADER'));
+                                       define('__TEXT_MESSAGE'  , getMessage('SPONSOR_LOCK_SPONSOR_TEXT'));
                                } else {
                                        // Messages when sponsor's account is locked
-                                       define('__HEADER_MESSAGE', SPONSOR_UNLOCK_SPONSOR_HEADER);
-                                       define('__TEXT_MESSAGE'  , SPONSOR_UNLOCK_SPONSOR_TEXT);
+                                       define('__HEADER_MESSAGE', getMessage('SPONSOR_UNLOCK_SPONSOR_HEADER'));
+                                       define('__TEXT_MESSAGE'  , getMessage('SPONSOR_UNLOCK_SPONSOR_TEXT'));
                                }
 
                                // Create email link
-                               define('__EMAIL_LINK', "<a href=\"mailto:".$email."\">".__GENDER." ".__SURNAME." ".__FAMILY."</a>");
+                               define('__EMAIL_LINK', "<a href=\"mailto:".$email."\">{!__GENDER!} {!__SURNAME!} {!__FAMILY!}</a>");
 
                                // Display form
                                LOAD_TEMPLATE("admin_lock_sponsor");
                        }
                } else {
                        // Cannot change status on unconfirmed or pending accounts!
-                       $MSG = ADMIN_SPONSPOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS;
+                       $MSG = getMessage('ADMIN_SPONSPOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS');
                }
        } else {
                // Sponsor not found!
-               $MSG = ADMIN_SPONSOR_404_1.bigintval($_GET['id']).ADMIN_SPONSOR_404_2;
+               $MSG = sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval($_GET['id']));
        }
 } else {
        // Not called by what-list_sponsor.php
-       $MSG = ADMIN_CALL_NOT_DIRECTLY;
+       $MSG = getMessage('ADMIN_CALL_NOT_DIRECTLY');
 }
 
 if (!empty($MSG)) {
        // Output message
        LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
 }
+
 //
 ?>

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 88b2fff97b3ca99a86f72a40b2b682455765ca5e..06c4557c92bb6b21e18b873fb73a9b657d09c333 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -156,7 +156,7 @@ if (!empty($_GET['u_id'])) {
                                LOAD_TEMPLATE("admin_lock_user");
                        } else {
                                // Account does not exists!
-                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
+                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
                        }
                }
 
@@ -174,7 +174,7 @@ if (!empty($_GET['u_id'])) {
                }
        } else {
                // Account does not exists!
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</div>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
        }
 } else {
        // List all users

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index 648fa3a67b52b484c136c63202df1deb40a9dd50..c1f1f4a1be70d8808dac7cddfa4fde69970bb583 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -71,7 +71,7 @@ if (!empty($_GET['access'])) {
                        OUTPUT_HTML($OUTPUT);
 
                        // Output message
-                       LOAD_TEMPLATE("admin_settings_saved", false, UNKNOWN_LOGFILE_FORMAT_1.$access.UNKNOWN_LOGFILE_FORMAT_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT'), $access));
                        return;
                }
 
@@ -80,7 +80,7 @@ if (!empty($_GET['access'])) {
                exit;
        } else {
                // Not readable!
-               LOAD_TEMPLATE("admin_settings_saved", false, LOGFILE_NOT_READABLE_1.$access.LOGFILE_NOT_READABLE_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('LOGFILE_NOT_READABLE'), $access));
        }
 } else {
        // List access logfiles
@@ -93,14 +93,14 @@ if (!empty($_GET['access'])) {
                        // We currenly only like files with "access" as prefix, should be more flexible!
                        if (substr($file, 0, 6) == "access") {
                                // Okay, let us print it out
-                               OUTPUT_HTML("<li><a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&access=".urlencode($file)."\">".$file."</a></li>");
+                               OUTPUT_HTML("<li><a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;access=".urlencode($file)."\">".$file."</a></li>");
                        }
                }
                closedir($handle);
                OUTPUT_HTML("</ol>");
        } else {
                // logs directory does not exist
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_LOGS_DIR_404_1.getConfig('logs_base').ADMIN_LOGS_DIR_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_LOGS_DIR_404'), getConfig('logs_base')));
        }
 }
 

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index ec18232d4d8d68f780b8f965b0c816cff301affc..838204470b135932469d58934c9911dff5468f3a 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -119,7 +119,7 @@ if ($_GET['u_id'] == "all") {
                }
        } else {
                // User not found!
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</strong>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
        }
 } else {
        // Output selection form with all confirmed user accounts listed

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index 7da2d0635584a34628171672473ccd76055b99f8..5260a3ef79a545d2fd3d1091f08e6a2137becb24 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(getMessage('GUEST_404_ACTION'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 89989bd8b4979ff7969bc390fa639d4a21a098f4..322ec971f854062d4107954329469e8556144ccb 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -49,7 +49,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(getMessage('GUEST_404_ACTION'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index 646805957024b583842b0631e7575edfd9b08e0d..bbfbfdf790a4a670cf54bbc3eae59488d882ee49 100644 (file)
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -49,7 +49,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(getMessage('GUEST_404_ACTION'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index f55c33b583b9521378435c6ec23c11e2e129b6ef..3f29c8537168040f16cc9cbae8b614bc9459a5b5 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -51,7 +51,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {
-       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(getMessage('GUEST_404_ACTION'), $GLOBALS['what']);
 }
 
 //

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index f863e221df5afe8ce35160c0aa87736f3b1f21bc..d742a4fbeeb3c9fa3d2d75d6a085e9797bdecbeb 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -75,7 +75,7 @@ case "show": // Show his data
        // How far is last change on his profile away from now?
        if ((($DATA[13] + getConfig('profile_lock')) > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
                // You cannot change your account
-               define('CHANGE', "<div class=\"member_failed\">".MEMBER_PROFILE_LOCKED_1.MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0").MEMBER_PROFILE_LOCKED_2."</div>");
+               define('CHANGE', "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0"))."</div>");
        } else {
                // He is allowed to change his profile
                define('CHANGE', LOAD_TEMPLATE("member_mydata_button", true));

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 702d81a3564845b0a095f8c092e18789183ae31c..c255e92df9a42ec2eac2f43d54adc915da46a6dd 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -716,7 +716,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_HAS_ZERO_MMAILS'));
 } else {
        // Please confirm some mails first
-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_LINKS_LEFT_1.$links.MEMBER_LINKS_LEFT_2.getConfig('unconfirmed').MEMBER_LINKS_LEFT_3);
+       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('MEMBER_LINKS_LEFT'), $links, getConfig('unconfirmed')));
 }
 
 if (!empty($URL)) {

diff --git a/mailid_top.php b/mailid_top.php
index eae1ea2cae74513235f2601cbd439cebf7445d28..71983620c52892289f18ed8e81b6ee6b1754a5b5 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -323,12 +323,15 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                        LOAD_TEMPLATE("mailid_timer");
                                                                        break;
                                                                } // END - switch
+                                                       } else {
+                                                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (6)</div>");
                                                        }
-                                                        else LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (6)</div>");
+                                               } else {
+                                                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (5)</div>");
                                                }
-                                                else LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (5)</div>");
+                                       } else {
+                                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (4)</div>");
                                        }
-                                        else LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (4)</div>");
                                } else {
                                        SQL_FREERESULT($result);
                                        LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (3)</div>");

diff --git a/modules.php b/modules.php
index 58c36a4e32fd33f2f97bd7c8c55f9b96c79f372b..15e4cf4d18b78c19acc7beca439f594660485124 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -120,27 +120,27 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
                        // An URL was specified so we load the de-referrer module
                        LOAD_URL(DEREFERER($URL));
                } elseif (getTotalFatalErrors() == 0) {
-                       addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+                       addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                }
                break;
 
        case "404":
-               addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+               addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                break;
 
        case "locked":
                if (!FILE_READABLE(constant('__MODULE'))) {
                        // Module does addionally not exists
-                       addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+                       addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                } // END - if
 
                // Add fatal message
-               addFatalMessage(LANG_MOD_REG_LOCKED_1.$GLOBALS['module'].LANG_MOD_REG_LOCKED_2);
+               addFatalMessage(sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
                break;
 
        default:
                DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
-               addFatalMessage(LANG_MOD_REG_UNKNOWN_1.$check.LANG_MOD_REG_UNKNOWN_2);
+               addFatalMessage(sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
                break;
        }
 } elseif (getTotalFatalErrors() == 0) {