From: Roland Häder Date: Mon, 23 Feb 2009 16:41:03 +0000 (+0000) Subject: More language strings rewritten X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=1cf72a9c1a5e737509af79d49f0731da2eb6a218 More language strings rewritten --- diff --git a/inc/filters.php b/inc/filters.php index f479861e71..f289810b53 100644 --- 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 6fc7d1bd97..ffdcd76a16 100644 --- 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 = "
".ADMIN_ID_404_1.$aid.ADMIN_ID_404_2."
"; + $admin = "
".sprintf(getMessage('ADMIN_ID_404'), $aid)."
"; } } // END - if diff --git a/inc/language/admins_de.php b/inc/language/admins_de.php index 7afc3a62ce..24b621e346 100644 --- 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 3c2d2d2b3b..fb49fbe18f 100644 --- 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 "); -define('LANG_MOD_REG_404_2', " existiert nicht!"); -define('LANG_MOD_NOT_REG', " ist nicht registriert!"); +define('LANG_MOD_REG_404', "Modul %s 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 "); -define('LANG_MOD_REG_UNKNOWN_2', " ist unbekannt!"); -define('LANG_MOD_REG_LOCKED_1', "Das Modul "); -define('LANG_MOD_REG_LOCKED_2', " wurde gesperrt!"); -define('ADMIN_UNKNOWN_ACTION_1', "Unbekannte Admin-Aktion "); -define('ADMIN_UNKNOWN_ACTION_2', " erkannt! Bitte das Modul richtig aufrufen!"); -define('ADMIN_ACTION_404_1', "Admin-Modul für Aktion "); -define('ADMIN_ACTION_404_2', " nicht gefunden!"); +define('LANG_MOD_REG_UNKNOWN', "Der Return-Code %s ist unbekannt!"); +define('LANG_MOD_REG_LOCKED', "Das Modul %s 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 "); -define('ADMIN_404_ACTION_2', " ist zwar gültig, konnte aber nicht auf dem Server gefunden werden."); +define('ADMIN_ACTION_404', "Das aufgerufe Admin-Modul %s ist zwar gültig, konnte aber nicht auf dem Server gefunden werden."); define('ALREADY_INSTALLED', "Dieses Script ist bereits auf diesem Server installiert worden Bitte löschen Sie install.php inc/install-inc.php und install.sql von Ihrem Server! (Keine Sorge, Sie kö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änge"); define('SETTINGS_NOT_SAVED', "Einstellungen NICHT gespeichert / geä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äter noch einmal vorbei!"); -define('ADMIN_INVALID_ACTION', "Ungültige action/what-Kombination erkannt! Bitte rufen Sie das Admin-Menü richtig auf!"); -define('ADMIN_INVALID_ACTION_1', "Die action/what-Kombination "); -define('ADMIN_INVALID_ACTION_2', " ist ungültig!"); +define('ADMIN_ACTION_INVALID', "Die action/what-Kombination %s ist ungültig!"); define('SHORT_PASS', "Das eingegebene Passwort ist nach unseren Sicherheitseinstellungen zu kurz. Mindestlänge ist"); define('EDIT_POINTS_SETTINGS', "Ändern der Willkommensgutschrift und anderer {!POINTS!}"); define('POINTS_REGISTER', "Willkommensgutschrift"); @@ -641,19 +629,15 @@ define('ADMIN_MEM_NO_CATS_1', "Das Mitglied "); define('ADMIN_MEM_NO_CATS_2', " hat keine Kategorien ausgewählt!"); define('USER_ID', "Mitglied"); define('UNCONFIRMED_LINKS', "Unbestätigte Mails"); -define('ADMIN_MEMBER_LINKS_1', "Das Mitglied "); -define('ADMIN_MEMBER_LINKS_2', " hat alle seine Mails bestätigt."); +define('ADMIN_MEMBER_LINKS', "Das Mitglied %s hat alle seine Mails bestätigt."); define('MEMBER_TOTAL_LINKS_1', "Es müssen noch "); define('MEMBER_TOTAL_LINKS_2', " Mails von diesem Mitglied bestätigt werden!"); define('ADMIN_DEL_UNCONFIRMED_LINKS', "Alle unbestätigten Mails löschen"); define('ADMIN_LINKS_DELETED', "Links für unbestätigte Mails wurden gelöscht!"); define('ADMIN_DEL_LINK_SUBJ', "Ihr unbestaetigen Mails wurden geloescht!"); -define('MEMBER_LINKS_LEFT_1', "Sie haben "); -define('MEMBER_LINKS_LEFT_2', " unbestätigte Mails. Bitte bestätigen Sie diese zuerst. Wenn Sie weniger als "); -define('MEMBER_LINKS_LEFT_3', " Mails im Account haben, können Sie auch wieder buchen."); +define('MEMBER_LINKS_LEFT', "Sie haben %s unbestätigte Mails. Bitte bestätigen Sie diese zuerst. Wenn Sie weniger als %s Mails im Account haben, können Sie auch wieder buchen."); define('TODAY', "Heute"); -define('MEMBER_PROFILE_LOCKED_1', "Sie können Ihren Account erst am "); -define('MEMBER_PROFILE_LOCKED_2', " wieder ändern!"); +define('MEMBER_PROFILE_LOCKED', "Sie können Ihren Account erst am %s wieder ändern!"); define('MEMBER_HAS_ZERO_MMAILS', "Sie haben Ihren Empfang auf Urlaub stehen! Bitte stellen Sie unter "Profildaten ändern" den Empfang höher ein!"); define('REF_CLIX', "Clicks"); define('REF_VIEWS', "Views"); @@ -676,10 +660,7 @@ define('ADMIN_DELETE_BONUS_MAIL', "Obrige Bonus-Mail löschen"); define('ADMIN_DELETE_NORMAL_MAIL', "Obrige Normal-Mail löschen"); define('ADMIN_REALLY_DELETE_ALL_MAILS', "Wollen Sie wirklich alle Mails löschen?"); define('SURNAME_FAMILY', "Vor- und Nachname"); -define('ADMIN_TOTAL_REFS_1', "Das Mitglied "); -define('ADMIN_TOTAL_REFS_2', " hat bereits "); -define('ADMIN_TOTAL_REFS_3', " weitere(s) Mitglied(er) geworben, davon sind "); -define('ADMIN_TOTAL_REFS_4', " gesperrt oder nicht bestätigt!"); +define('ADMIN_USER_TOTAL_REFS', "Das Mitglied %s hat bereits %s weitere(s) Mitglied(er) geworben, davon sind %s gesperrt oder nicht bestätigt!"); define('REFS_COUNT', "Refs"); define('MEMBER_JOINED', "Beigetreten"); define('ADMIN_EMAIL_DELETED', "E-Mail wurde aus dem System gelö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üchern konnte nicht gefunden werden! ("); -define('ADMIN_LOGS_DIR_404_2', ") Vermutlich unterstützt Ihr Server dieses nicht."); -define('ADMIN_USAGE_DIR_404_1', "Das Verzeichnis mit den Webalizer-Statistiken konnte nicht gefunden werden! ("); -define('ADMIN_USAGE_DIR_404_2', ") Vermutlich unterstü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 "); -define('ADMIN_ID_404_2', " nicht gefunden!"); +define('ADMIN_ID_404_1', "ID %s 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', " 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üpunkt nicht direkt aufrufen!"); -define('ADMIN_UNCONFIRMED_POOL_MISSING_1', "Es fehlen Daten im Sende-Pool zur Mail-ID "); -define('ADMIN_UNCONFIRMED_POOL_MISSING_2', " !"); -define('ADMIN_UNCONFIRMED_STATS_MISSING_1', "Es fehlen Daten in der User-Statistik zur Mail-ID "); -define('ADMIN_UNCONFIRMED_STATS_MISSING_2', " !"); +define('ADMIN_UNCONFIRMED_POOL_MISSING', "Es fehlen Daten im Sende-Pool zur Mail-ID %s !"); +define('ADMIN_UNCONFIRMED_STATS_MISSING', "Es fehlen Daten in der User-Statistik zur Mail-ID %s !"); define('ADMIN_UNCONFIRMED_INVALID_LINK', "Ungütigen Link aufgerufen oder Mail ist nicht mehr vorhanden!"); define('ADMIN_UNCONFIRMED_NO_LINK_LEFT', "Diese Mailbuchung wurde komplett bestä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 "); -define('LOGFILE_NOT_READABLE_2', " konnte nicht geladen werden."); -define('UNKNOWN_LOGFILE_FORMAT_1', "Das Logbuch "); -define('UNKNOWN_LOGFILE_FORMAT_2', " hat ein ungültiges oder nicht unterstütztes Format."); define('MESSAGE_HEADER', "Hinweis"); define('ADMIN_ALPHA_SELCTION', "Alphabetische Suche:"); define('CATEGORY_NOT_SAVED', "Kategorie %d nicht gespeichert."); diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php index c7be819f9a..102aa8c699 100644 --- 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 %s erkannt. Bitte Bug melden."); define('DOUBLER_NO_ENTRIES_FOUND', "Keine Einträ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 b59e0cf75a..f3bc65839f 100644 --- 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 "); -define('LANG_MOD_REG_404_2', " does not exists."); -define('LANG_MOD_NOT_REG', " is not registered."); +define('LANG_MOD_REG_404', "Module %s 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 "); -define('LANG_MOD_REG_UNKNOWN_2', " detected!"); -define('LANG_MOD_REG_LOCKED_1', "Selected module "); -define('LANG_MOD_REG_LOCKED_2', " is locked!"); -define('ADMIN_UNKNOWN_ACTION_1', "Unknown administrator-action "); -define('ADMIN_UNKNOWN_ACTION_2', " detected. Please call this module correctly!"); -define('ADMIN_ACTION_404_1', "Administrator module for action "); -define('ADMIN_ACTION_404_2', " was not found on server."); +define('LANG_MOD_REG_UNKNOWN', "Unknown return-code %s detected!"); +define('LANG_MOD_REG_LOCKED', "Selected module %s 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 "); -define('ADMIN_404_ACTION_2', " is well valid but it is not on this server."); +define('ADMIN_ACTION_404', "Called admin-module %s 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 "); -define('ADMIN_INVALID_ACTION_2', " is invalid!"); +define('ADMIN_ACTION_INVALID', "Your combination action/what %s 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 d1714ecd52..a38e66d77f 100644 --- 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üchern konnte nicht gefunden werden! ("); -define('ADMIN_LOGS_DIR_404_2', ") Vermutlich unterstützt Ihr Server dieses nicht."); -define('LOGFILE_NOT_READABLE_1', "Das Logbuch "); -define('LOGFILE_NOT_READABLE_2', " konnte nicht geladen werden."); -define('UNKNOWN_LOGFILE_FORMAT_1', "Das Logbuch "); -define('UNKNOWN_LOGFILE_FORMAT_2', " hat ein ungültiges oder nicht unterstütztes Format."); +define('ADMIN_LOGS_DIR_404', "Das Verzeichnis mit den Zugriffslogbüchern konnte nicht gefunden werden! (%s) Vermutlich unterstützt Ihr Server dieses nicht."); +define('ADMIN_LOGFILE_NOT_READABLE', "Das Logbuch %s konnte nicht geladen werden."); +define('ADMIN_UNKNOWN_LOGFILE_FORMAT', "Das Logbuch %s hat ein ungültiges oder nicht unterstütztes Format."); // ?> diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 7065464bbf..4ce1bc227b 100644 --- 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 "); -define('ADMIN_SPONSOR_404_2', " nicht gefunden!"); -define('ADMIN_SPONSOR_REFS_404_1', "Der Sponsor "); -define('ADMIN_SPONSOR_REFS_404_2', " hat keine Referals!"); +define('ADMIN_SPONSOR_404', "Sponsorenaccount %s nicht gefunden!"); +define('ADMIN_SPONSOR_REFS_404', "Der Sponsor %s hat keine Referals!"); define('ADMIN_SPONSOR_DETAILS', "Datenblatt eines Sponsors"); define('ADMIN_SPONSOR_COMPANY_DATA', "Firmendaten des Sponsors"); define('ADMIN_SPONSOR_PERSONA_DATA', "Persö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ütiger Modus "); -define('ADMIN_INVALID_MODE_2', " angegeben!"); -define('ADMIN_TPL_404_1', "Modus-Template "); -define('ADMIN_TPL_404_2', " nicht gefunden!"); +define('ADMIN_SPONSOR_INVALID_MODE', "Ungütiger Modus %s angegeben!"); +define('ADMIN_SPONSOR_MODUS_TPL_404', "Modus-Template %s 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 "); define('ADMIN_HEADER_DEL_SPONSOR_2', " löschen"); define('ADMIN_TEXT_DEL_SPONSOR_1', "Möchten Sie den Sponsoren "); define('ADMIN_TEXT_DEL_SPONSOR_2', " mit samt aller seiner Bestellungen unwiederruflich löschen?"); -define('SPONSOR_DELETED_1', "Sponsorenaccount "); -define('SPONSOR_DELETED_2', " entfernt."); +define('ADMIN_SPONSOR_DELETED', "Sponsorenaccount %s entfernt."); define('GUEST_SPONSOR_TITLE', "Anmeldung als Sponsor"); define('GUEST_SPONSOR_TEASER_1', "Melden Sie sich als Sponsor von {!MAIN_TITLE!} an! Hier bekommen Sie für Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!"); define('GUEST_SPONSOR_TEASER_2', "Alles inklusiv: Ausführliche Statistiken (auch per Mail im gewünschten Zeitabstand) und einfache Verwaltung Ihrer {!POINTS!} mit nur wenigen Klicks!"); @@ -141,7 +136,7 @@ define('SPONSOR_ACCEPT_TERMS', "Ich/wir habe/n die [mindestens eingekauft werden? (meistens einmal)"); define('SPONSOR_PAYTYPE_CURRENCY_NOTE', "Währung des Geldbetrages, die der Sponsor an Sie überweisen soll."); -define('SPONSOR_ADMIN_PAYTYPE_ALREADY_1', "Buchungspaket "); -define('SPONSOR_ADMIN_PAYTYPE_ALREADY_2', " bereits eingerichtet."); -define('SPONSOR_ADMIN_PAYTYPE_ADDED_1', "Buchungspaket "); -define('SPONSOR_ADMIN_PAYTYPE_ADDED_2', " hinzugefügt."); +define('ADMIN_SPONSOR_PAYTYPE_ALREADY_1', "Buchungspaket "); +define('ADMIN_SPONSOR_PAYTYPE_ALREADY_2', " bereits eingerichtet."); +define('ADMIN_SPONSOR_PAYTYPE_ADDED_1', "Buchungspaket "); +define('ADMIN_SPONSOR_PAYTYPE_ADDED_2', " hinzugefügt."); define('SPONSOR_LIST_PAYMENT_TYPES_TITLE', "Buchungspakete auflisten, bearbeiten und lö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 b492bcaab5..b24dcdb1a6 100644 --- 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 "); -define('TASK_ADMIN_UNKNOWN_MODE_2', " erkannt!"); +define('ADMIN_TASK_UNKNOWN_MODE', "Unbekannter Modus %s erkannt!"); define('ADMIN_OVERVIEW_TASK_YOUR_TYPE', "Ihre zugewiesen Aufgaben (ohne Updates)"); define('ADMIN_OVERVIEW_TASK_UPDATES_TYPE', "Automatisch durchgefü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ösc Die automatische Löschung erfolgt durch die autopurge-Erweiterung.
Sie können die Aufgaben aber auch jetzt endgültig lö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 5d7c8f9a17..87b924d5dc 100644 --- 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 69eaf11bc2..85685d1baf 100644 --- 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 2247dfdb83..3c41577b53 100644 --- 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 572b5a83db..d9511b39dc 100644 --- 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 ec9c8cf303..08cfc5f29c 100644 --- 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 303a858393..ca1f750f4c 100644 --- 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 dcdc7e38df..2cdec1e99f 100644 --- 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 cc980cf9b7..5e4d6eba02 100644 --- 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 eec930c8ea..bc860f3d6c 100644 --- 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 6f6b74abfc..81e5691207 100644 --- 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 a0ecec34ec..3d523770d4 100644 --- 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 eae1d188f8..658d6089a2 100644 --- 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 29af434667..5b9c3c0779 100644 --- 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 48bc6cc5fc..870416adf4 100644 --- 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 9b7df7e7d1..f0719b7fb7 100644 --- 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 f94fd846ef..d6fc98d3cf 100644 --- 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 d2cb9c50c9..de7d1a4455 100644 --- 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 b9452b7958..8eabf88196 100644 --- 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 4100288347..9615d3654f 100644 --- 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 9b721fe396..90b42463c3 100644 --- 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 3aa5af4296..cbbd29c4ed 100644 --- 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 d1e14ad33b..05cc6dd7a6 100644 --- 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 8175c2f86e..048c8e3529 100644 --- 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 cdc524036e..a882e5445e 100644 --- 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 4957c8f847..3e323131e7 100644 --- 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 50174c2379..2850f95bfa 100644 --- 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 cf783511a8..3dc99e4a3e 100644 --- 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, "
".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-admins_mails.php b/inc/modules/admin/what-admins_mails.php index 3305017e37..1c56e96469 100644 --- 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 .= "".bigintval($_GET['rid'])."".ADMIN_SPONSOR_REFS_404_2); + LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SPONSOR_REFS_404'), "".bigintval($_GET['rid'])."")); } } 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 32dfa7dd03..9e1033bc70 100644 --- 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 c5ff148753..47a4531ecf 100644 --- 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 5223164e6b..493903850c 100644 --- 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 1787b6f75d..0c46cbe3fc 100644 --- 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 7560ac483d..d3020a6a0a 100644 --- 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 1fbb825981..bed365337a 100644 --- 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', "".__GENDER." ".__SURNAME." ".__FAMILY.""); + define('__EMAIL_LINK', "{!__GENDER!} {!__SURNAME!} {!__FAMILY!}"); // 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 88b2fff97b..06c4557c92 100644 --- 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, "
".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'])."
"); } } @@ -174,7 +174,7 @@ if (!empty($_GET['u_id'])) { } } else { // Account does not exists! - 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 { // List all users diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php index 648fa3a67b..c1f1f4a1be 100644 --- 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("
  • ".$file."
    • "); + OUTPUT_HTML("
  • ".$file."
    • "); } } closedir($handle); OUTPUT_HTML(""); } 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 ec18232d4d..838204470b 100644 --- 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, "
    ".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/guest/action-admin.php b/inc/modules/guest/action-admin.php index 7da2d06355..5260a3ef79 100644 --- 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 89989bd8b4..322ec971f8 100644 --- 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 6468059570..bbfbfdf790 100644 --- 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 f55c33b583..3f29c85371 100644 --- 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 f863e221df..d742a4fbee 100644 --- 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', "
    ".MEMBER_PROFILE_LOCKED_1.MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0").MEMBER_PROFILE_LOCKED_2."
    "); + define('CHANGE', "
    ".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0"))."
    "); } 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 702d81a356..c255e92df9 100644 --- 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 eae1ea2cae..71983620c5 100644 --- 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, "
    {--MAIL_ALREADY_CONFIRMED--} (6)
    "); } - else LOAD_TEMPLATE("admin_settings_saved", false, "
    {--MAIL_ALREADY_CONFIRMED--} (6)
    "); + } else { + LOAD_TEMPLATE("admin_settings_saved", false, "
    {--MAIL_ALREADY_CONFIRMED--} (5)
    "); } - else LOAD_TEMPLATE("admin_settings_saved", false, "
    {--MAIL_ALREADY_CONFIRMED--} (5)
    "); + } else { + LOAD_TEMPLATE("admin_settings_saved", false, "
    {--MAIL_ALREADY_CONFIRMED--} (4)
    "); } - else LOAD_TEMPLATE("admin_settings_saved", false, "
    {--MAIL_ALREADY_CONFIRMED--} (4)
    "); } else { SQL_FREERESULT($result); LOAD_TEMPLATE("admin_settings_saved", false, "
    {--MAIL_ALREADY_CONFIRMED--} (3)
    "); diff --git a/modules.php b/modules.php index 58c36a4e32..15e4cf4d18 100644 --- 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) {