From: Roland Häder Date: Mon, 28 Jun 2010 21:38:03 +0000 (+0000) Subject: New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites: X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=29385a0483bbcbbe940a32a49d488b1d5add15c5 New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites: - New (template) wrapper function fixEmptyContentToDashes() introduced, this function should help template writers to deal with empty content. If an empty string is detected, it got converted into three dashes. This may fix some issues with empty div and/or td tags. - Even more rewrites to make use of EL - TODOs.txt updated --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index c6424c7d17..7b865d60fc 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -39,24 +39,23 @@ ./inc/extensions/ext-yoomedia.php:123: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:56:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); ./inc/extensions-functions.php:143: // @TODO Do we still need this? setExtensionUpdateNotes(''); -./inc/extensions-functions.php:422:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) -./inc/extensions-functions.php:538: // @TODO Extension is loaded, what next? -./inc/functions.php:1072:// @TODO $simple/$constants are deprecated -./inc/functions.php:1099: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates -./inc/functions.php:2379: // @TODO This can be easily moved out after the merge from EL branch to this is complete -./inc/functions.php:2528: // @TODO Add a little more infos here -./inc/functions.php:2612: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:2635: // @TODO Rewrite this old lost code to a template +./inc/extensions-functions.php:428:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) +./inc/extensions-functions.php:544: // @TODO Extension is loaded, what next? +./inc/functions.php:1065:// @TODO $simple/$constants are deprecated +./inc/functions.php:1092: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates +./inc/functions.php:2372: // @TODO This can be easily moved out after the merge from EL branch to this is complete +./inc/functions.php:2521: // @TODO Add a little more infos here +./inc/functions.php:2605: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:2628: // @TODO Rewrite this old lost code to a template ./inc/functions.php:266: // @TODO Remove this sanity-check if all is fine ./inc/functions.php:269: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2725: // @TODO Are these convertions still required? -./inc/functions.php:2743:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:3619:// @TODO Lame description for this function -./inc/functions.php:3638: // @TODO Move this in a filter -./inc/functions.php:3762: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:476: // @TODO Do only use $content, not $DATA or raw variables -./inc/functions.php:549: // @TODO Extension 'msg' does not exist -./inc/functions.php:612:// @TODO Rewrite this to an extension 'smtp' +./inc/functions.php:2718: // @TODO Are these convertions still required? +./inc/functions.php:2736:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:3620:// @TODO Lame description for this function +./inc/functions.php:3639: // @TODO Move this in a filter +./inc/functions.php:3763: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:542: // @TODO Extension 'msg' does not exist +./inc/functions.php:605:// @TODO Rewrite this to an extension 'smtp' ./inc/install-functions.php:63: // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0); ./inc/language/de.php:1143:// @TODO Rewrite these two constants ./inc/language/de.php:1158:// @TODO Rewrite these three constants @@ -74,19 +73,19 @@ ./inc/libs/doubler_functions.php:46:// @TODO Lame description ./inc/libs/doubler_functions.php:94: // @TODO Can't this be moved into EL? ./inc/libs/mailid_functions.php:49: // @TODO Rewrite this to a dynamic include or so -./inc/libs/rallye_functions.php:708:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() -./inc/libs/rallye_functions.php:779: $EXPIRE = 3; // @TODO The hard-coded value... -./inc/libs/rallye_functions.php:865:// @TODO Please document this function -./inc/libs/rallye_functions.php:921: // Load count @TODO Can't we rewrite this to our API? +./inc/libs/rallye_functions.php:703:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() +./inc/libs/rallye_functions.php:773: $EXPIRE = 3; // @TODO The hard-coded value... +./inc/libs/rallye_functions.php:859:// @TODO Please document this function +./inc/libs/rallye_functions.php:915: // Load count @TODO Can't we rewrite this to our API? ./inc/libs/refback_functions.php:61: // @TODO Try to rewrite the following unset() ./inc/libs/register_functions.php:299: // @TODO Rewrite these all to a single filter ./inc/libs/register_functions.php:375: // @TODO Rewrite this to a filter ./inc/libs/register_functions.php:382: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete ./inc/libs/register_functions.php:383: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable -./inc/libs/surfbar_functions.php:1547: // @TODO This can be somehow rewritten -./inc/libs/surfbar_functions.php:719:// @TODO Can't we use our new expression language instead of this ugly code? -./inc/libs/surfbar_functions.php:963: // @TODO Invalid salt should be refused -./inc/libs/task_functions.php:245: // @TODO These can be rewritten to filter +./inc/libs/surfbar_functions.php:1541: // @TODO This can be somehow rewritten +./inc/libs/surfbar_functions.php:713:// @TODO Can't we use our new expression language instead of this ugly code? +./inc/libs/surfbar_functions.php:957: // @TODO Invalid salt should be refused +./inc/libs/task_functions.php:241: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters ./inc/libs/theme_functions.php:95: // @TODO Can't this be rewritten to an API function? ./inc/libs/user_functions.php:146: // @TODO These two constants are no longer used, maybe we reactivate this code? @@ -102,11 +101,11 @@ ./inc/modules/admin/admin-inc.php:325: // @TODO Rewrite this to $content = SQL_FETCHARRAY() ./inc/modules/admin/admin-inc.php:331: // @TODO ACL is 'allow'... hmmm ./inc/modules/admin/admin-inc.php:431:// @TODO Try to rewrite this to adminAddMenuSelectionBox() -./inc/modules/admin/overview-inc.php:167: // @TODO Rewrite this to a filter -./inc/modules/admin/overview-inc.php:281: // @TODO Rewrite this to something with include files and/or filter -./inc/modules/admin/overview-inc.php:319: // @TODO This may also be rewritten to include files -./inc/modules/admin/overview-inc.php:321: default: // @TODO Unknown support mode -./inc/modules/admin/overview-inc.php:442: // @TODO Try to move this in includes +./inc/modules/admin/overview-inc.php:164: // @TODO Rewrite this to a filter +./inc/modules/admin/overview-inc.php:278: // @TODO Rewrite this to something with include files and/or filter +./inc/modules/admin/overview-inc.php:316: // @TODO This may also be rewritten to include files +./inc/modules/admin/overview-inc.php:318: default: // @TODO Unknown support mode +./inc/modules/admin/overview-inc.php:439: // @TODO Try to move this in includes ./inc/modules/admin/overview-inc.php:45:// @TODO This function does also check for uncompleted tasks ./inc/modules/admin/what-add_guestnl_cat.php:49: // @TODO Check if category does already exist ./inc/modules/admin/what-add_surfbar_url.php:57: // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestParameter() calls to $postData @@ -116,11 +115,10 @@ ./inc/modules/admin/what-adminedit.php:58: // @TODO Kill all constants in this file ./inc/modules/admin/what-admins_mails.php:61: // @TODO Can this be rewritten to an API function? ./inc/modules/admin/what-bonus.php:48:// @TODO Unused at the moment -./inc/modules/admin/what-config_admins.php:146: // @TODO Rewrite this to filter 'run_sqls' +./inc/modules/admin/what-config_admins.php:132: // @TODO Rewrite this to filter 'run_sqls' ./inc/modules/admin/what-config_mods.php:57: // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function ./inc/modules/admin/what-config_points.php:113: // @TODO Rewrite this to a filter -./inc/modules/admin/what-config_rallye_prices.php:212: // @TODO Rewritings: level->price_level, infos->info in template -./inc/modules/admin/what-config_rallye_prices.php:229: // @TODO Rewrite these two constants +./inc/modules/admin/what-config_rallye_prices.php:207: // @TODO Rewrite these two constants ./inc/modules/admin/what-config_register.php:78: // @TODO Move this HTML code into a template ./inc/modules/admin/what-del_email.php:60: // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price'); ./inc/modules/admin/what-del_email.php:61: // @TODO Unused: cat_id, payment_id @@ -134,7 +132,7 @@ ./inc/modules/admin/what-holiday_list.php:48:// @TODO Unused at the moment ./inc/modules/admin/what-list_autopurge.php:49:// @TODO Rewrite those lines to filter ./inc/modules/admin/what-list_bonus.php:135: // @TODO Can't this be moved into our expression language? -./inc/modules/admin/what-list_cats.php:56: // @TODO No longer needed? define('__CATS_BASE' , 'mail_title, pay->payment in template +./inc/modules/admin/what-payments.php:152: // @TODO Rewritings: title->mail_title in template ./inc/modules/admin/what-refbanner.php:145: // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template ./inc/modules/admin/what-unlock_emails.php:89: // @TODO Rewrite these if-blocks to a filter ./inc/modules/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php ./inc/modules/admin/what-usr_online.php:51: // @TODO Add a filter for sponsor -./inc/modules/guest/what-beg.php:60:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout'))); +./inc/modules/guest/what-beg.php:53:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout'))); ./inc/modules/guest/what-confirm.php:120: // @TODO Try to rewrite the following unset() ./inc/modules/guest/what-login.php:114: // @TODO Move this HTML code into a template ./inc/modules/guest/what-mediadata.php:183:// @TODO Rewrite all these if-blocks to filters @@ -177,7 +175,7 @@ ./inc/modules/member/what-categories.php:129: // @TODO Rewrite this to use $OUT .= ... ./inc/modules/member/what-order.php:457: // @TODO Rewrite this to a filter ./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter -./inc/modules/member/what-payout.php:222: // @TODO Rewrite this to a filter +./inc/modules/member/what-payout.php:218: // @TODO Rewrite this to a filter ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter? ./inc/modules/member/what-rallyes.php:91: // @TODO Reactivate this: $content['admin'] = '' . $content['login'] . ''; ./inc/modules/member/what-refback.php:128: // @TODO UNUSED: $refRow['status'] = translateUserStatus($refRow['status']); @@ -193,13 +191,13 @@ ./inc/mysql-manager.php:1627: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() ./inc/mysql-manager.php:1727: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:2107: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:2148:// @TODO Fix inconsistency between last_module and getWhat() +./inc/mysql-manager.php:2151:// @TODO Fix inconsistency between last_module and getWhat() ./inc/mysql-manager.php:229: // @TODO Nothing helped??? ./inc/mysql-manager.php:264: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:589: // @TODO Try to rewrite this to one or more functions ./inc/mysql-manager.php:94:// @TODO Can we cache this? ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye -./inc/reset/reset_birthday.php:92: // @TODO 4 is hard-coded here, should we move it out in config? +./inc/reset/reset_birthday.php:91: // @TODO 4 is hard-coded here, should we move it out in config? ./inc/revision-functions.php:153:// @TODO Please describe this function ./inc/wrapper-functions.php:127:// @TODO Implement $compress ./inc/wrapper-functions.php:134:// @TODO Implement $decompress diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php index ef9343478e..a0c315998c 100644 --- a/inc/autopurge/purge-general.php +++ b/inc/autopurge/purge-general.php @@ -149,7 +149,7 @@ ORDER BY // Add points from deleted accounts to jackpot, but here just add to notify mail if ($admin_points > 0) { // Send mail to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_SUBJECT'), 'admin_autopurge_points', translateComma($admin_points)); + sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', translateComma($admin_points)); } // END - if // Run all SQLs here diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php index a6fc4fc347..aa74f85ad8 100644 --- a/inc/autopurge/purge-inact.php +++ b/inc/autopurge/purge-inact.php @@ -119,7 +119,7 @@ ORDER BY $useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2)); // Send mail notification to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent); + sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $useridsContent); } // END - if // Free memory @@ -161,7 +161,7 @@ ORDER BY // Send mail notification to admin if (getConfig('ap_in_notify') == 'Y') { - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent); + sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_SUBJECT--}', 'admin_autopurge_delete', $useridsContent); } // END - if } // END - if diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php index 79fbe434eb..765c775836 100644 --- a/inc/autopurge/purge-mails.php +++ b/inc/autopurge/purge-mails.php @@ -132,7 +132,7 @@ SQL_FREERESULT($result_mails); // Do we have deleted mails and the admin want's to receive a notification if (($deletedStats > 0) && (getConfig('ap_dm_notify') == 'Y')) { // Send out email to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $deletedStats); + sendAdminNotification('{--ADMIN_AUTOPURGE_DEL_MAILS_SUBJECT--}', 'admin_autopurge_del_mails', $deletedStats); } // END - if // diff --git a/inc/autopurge/purge-tsks.php b/inc/autopurge/purge-tsks.php index ddef951cf0..3e1c97b4a8 100644 --- a/inc/autopurge/purge-tsks.php +++ b/inc/autopurge/purge-tsks.php @@ -64,7 +64,7 @@ WHERE // Do we need to send a notification? if (($deletedTasks > 0) && (getConfig('ap_tasks_notify') == 'Y')) { // Send out email to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TASKS_SUBJECT'), 'admin_autopurge_tsks', $deletedTasks); + sendAdminNotification('{--ADMIN_AUTOPURGE_TASKS_SUBJECT--}', 'admin_autopurge_tsks', $deletedTasks); } // END - if } // END - if diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php index e6276a98ce..c8f587e3e4 100644 --- a/inc/autopurge/purge-unconfirmed.php +++ b/inc/autopurge/purge-unconfirmed.php @@ -84,7 +84,7 @@ ORDER BY // Send mail notification to admin if (getConfig('ap_un_notify') == 'Y') { - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), 'admin_autopurge_unconfirmed', $userids); + sendAdminNotification('{--ADMIN_AUTOPURGE_UNCONFIRMED_SUBJECT--}', 'admin_autopurge_unconfirmed', $userids); } // END - if } // END - if diff --git a/inc/databases.php b/inc/databases.php index 5f383d2a37..82f7ebb0b8 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -55,7 +55,7 @@ addCode('LOGOUT_FAILED' , 0x009); addCode('URL_TLOCK' , 0x00a); addCode('URL_FOUND' , 0x00b); addCode('OVERLENGTH' , 0x00c); -addCode('SUBJ_URL' , 0x00d); +addCode('SUBJECT_URL' , 0x00d); addCode('BLIST_URL' , 0x00e); addCode('NO_RECS_LEFT' , 0x00f); addCode('INVALID_TAGS' , 0x010); diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 2aab347cb8..9c5771d453 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -921,7 +921,7 @@ function doDeactivateExtension($ext_name) { // Notify the admin sendAdminNotification( - getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), + '{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}', 'admin_ext_deactivated', array('ext_name' => $ext_name) ); @@ -944,7 +944,7 @@ function isExtensionOlder ($ext_name, $ext_ver) { // Creates a new task for updated extension function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) { // Create subject line - $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJ--}'; + $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJECT--}'; // Get task id $taskId = determineTaskIdBySubject($subject); @@ -1005,7 +1005,7 @@ function createNewExtensionTask ($ext_name) { // Creates a task for automatically deactivated (deprecated) extension function createExtensionDeactivationTask ($ext_name) { // Create subject line - $subject = sprintf("[%s:] %s", $ext_name, '{--TASK_SUBJ_EXTENSION_DEACTIVATED--}'); + $subject = sprintf("[%s:] %s", $ext_name, '{--ADMIN_TASK_EXTENSION_DEACTIVATED_SUBJECT--}'); // Get task id $taskId = determineTaskIdBySubject($subject); diff --git a/inc/functions.php b/inc/functions.php index 79edbc765d..a7630ce17f 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2538,7 +2538,7 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) { ); // Send email to webmaster - sendAdminNotification(getMessage('DEBUG_REPORT_BUG_SUBJECT'), 'admin_report_bug', $content); + sendAdminNotification('{--DEBUG_REPORT_BUG_SUBJECT--}', 'admin_report_bug', $content); } // END - if // And abort here @@ -2572,7 +2572,7 @@ function getMessageFromErrorCode ($code) { case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break; case getCode('OVERLENGTH') : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break; case getCode('URL_FOUND') : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break; - case getCode('SUBJ_URL') : $message = '{--MEMBER_SUBJ_CONTAINS_URL--}'; break; + case getCode('SUBJECT_URL') : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break; case getCode('BLIST_URL') : $message = '{--MEMBER_URL_BLACK_LISTED--}
{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break; case getCode('NO_RECS_LEFT') : $message = '{--MEMBER_SELECTED_MORE_RECS--}'; break; case getCode('INVALID_TAGS') : $message = '{--MEMBER_HTML_INVALID_TAGS--}'; break; diff --git a/inc/language/autopurge_de.php b/inc/language/autopurge_de.php index 976937948a..1b27a79e09 100644 --- a/inc/language/autopurge_de.php +++ b/inc/language/autopurge_de.php @@ -47,13 +47,13 @@ addMessages(array( 'AUTOPURGE_MEMBER_SUBJECT' => "{?POINTS?}-Gutschrift bei Auto-Loeschung", 'AUTOPURGE_MEMBER_INACTIVE_SUBJECT' => "Inaktivitaet --> Account wird bald gelöscht.", 'AUTOPURGE_MEMBER_UNCONFIRMED_SUBJECT' => "Löschung --> EMail-Adresse nicht bestätigt.", - 'AUTOPURGE_ADMIN_SUBJECT' => "[Auto-Purge:] Bestätigungslinks", - 'AUTOPURGE_ADMIN_INACTIVE_SUBJECT' => "Inaktive Mitglieder benachrichtigt", - 'AUTOPURGE_ADMIN_DELETE_SUBJECT' => "[Auto-Purge:] Inaktiven Mitgliedern", - 'AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT' => "[Auto-Purge:] Unbestätigten Accounts", - 'AUTOPURGE_ADMIN_TASKS_SUBJECT' => "[Auto-Purge:] Zu löschen marktierte Aufgaben", - 'AUTOPURGE_ADMIN_TURBO_SUBJECT' => "[Auto-Purge:] Veraltete Bonus-Eintraege", - 'AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT' => "[Auto-Purge:] Mailbuchungen bereits gel. Mitglieder", + 'ADMIN_AUTOPURGE_SUBJECT' => "[Auto-Purge:] Bestätigungslinks", + 'ADMIN_AUTOPURGE_INACTIVE_SUBJECT' => "Inaktive Mitglieder benachrichtigt", + 'ADMIN_AUTOPURGE_DELETE_SUBJECT' => "[Auto-Purge:] Inaktiven Mitgliedern", + 'ADMIN_AUTOPURGE_UNCONFIRMED_SUBJECT' => "[Auto-Purge:] Unbestätigten Accounts", + 'ADMIN_AUTOPURGE_TASKS_SUBJECT' => "[Auto-Purge:] Zu löschen marktierte Aufgaben", + 'ADMIN_AUTOPURGE_TURBO_SUBJECT' => "[Auto-Purge:] Veraltete Bonus-Eintraege", + 'ADMIN_AUTOPURGE_DEL_MAILS_SUBJECT' => "[Auto-Purge:] Mailbuchungen bereits gel. Mitglieder", 'ADMIN_AUTOPURGE_CONFIGURATION' => "Konfiguration der automatischen Löschungen", 'ADMIN_AUTOPURGE_INACTIVE' => "Sollten inaktive Accounts erkannt und gelöscht werden?", diff --git a/inc/language/de.php b/inc/language/de.php index 220016b421..eafdcb0c06 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -194,21 +194,21 @@ addMessages(array( 'CATEGORY_ALREADY_EXISTS' => "Kategorie existiert bereits.", 'EDIT_DEL_CATEGORIES' => "Aufgelistete Kategorien bearbeiten / löschen", 'CATNAME' => "Kategoriebezeichnung:", - 'EDIT_CATS' => "Kategorien bearbeiten", - 'DEL_CATS' => "Kategorien löschen", + 'EDIT_CATEGORIES' => "Kategorien bearbeiten", + 'DEL_CATEGORIES' => "Kategorien löschen", 'NO_CATEGORIES_VISIBLE' => "Derzeit sind keine Kategorien anzeigbar.", - 'MAX_RECEIVE' => "Wie viel Mails sollen Ihre Mitglieder maximal empfangen können? Fügen Sie bitte mehrere Werte hinzu, damit sich die Mitglieder dies individuell einstellen können.", - 'ADD_MAX_RECEIVE' => "Hinzufügen", + 'ADMIN_MAX_RECEIVE' => "Wie viel Mails sollen Ihre Mitglieder maximal empfangen können? Fügen Sie bitte mehrere Werte hinzu, damit sich die Mitglieder dies individuell einstellen können.", + 'ADMIN_ADD_MAX_RECEIVE' => "Hinzufügen", 'SAVE_SETTINGS' => "Einstellungen speichern", - 'ENTER_MAX_VALUE' => "Neuen Maximal-Wert (0 bis 9999)", - 'ENTER_MAX_COMMENT' => "Optionaler Hinweis (erscheint in Klammern hinter dem Wert!)", - 'MAX_VALUE_SAVED' => "Maximal-Wert gespeichert", - 'MAX_VALUE_ALREADY' => "Maximal-Wert existiert bereits.", - 'EDIT_DEL_MAX_VALUES' => "Maximal-Werte bearbeiten / löschen", - 'MAX_VALUE' => "Maximal zu empfangene Mails", - 'MAX_COMMENT' => "Hinweis zum Maximal-Wert", - 'EDIT_MAX_V' => "Bearbeiten", - 'DEL_MAX_V' => "Löschen", + 'ADMIN_ENTER_MAX_VALUE' => "Neuen Maximal-Wert (0 bis 9999)", + 'ADMIN_ENTER_MAX_COMMENT' => "Optionaler Hinweis (erscheint in Klammern hinter dem Wert!)", + 'ADMIN_MAX_VALUE_SAVED' => "Maximal-Wert gespeichert", + 'ADMIN_MAX_VALUE_ALREADY' => "Maximal-Wert existiert bereits.", + 'ADMIN_EDIT_DEL_MAX_VALUES' => "Maximal-Werte bearbeiten / löschen", + 'ADMIN_MAX_VALUE' => "Maximal zu empfangene Mails", + 'ADMIN_MAX_COMMENT' => "Hinweis zum Maximal-Wert", + 'ADMIN_EDIT_MAX_VALUE' => "Bearbeiten", + 'ADMIN_DEL_MAX_VALUE' => "Löschen", 'NO_MAX_VALUES' => "Derzeit klappt die Anmeldung nicht, da Sie keine maximal zu empfangenen Mails einstellen können.", 'MAX_PER_DAY' => "Maximale Mitgliedermails/Tag", 'PER_DAY' => "Mails", @@ -235,7 +235,7 @@ addMessages(array( 'POINTS_REGISTER' => "Willkommensgutschrift", 'POINTS_REF' => "Einmalige Referal-Gutschrift", 'EDIT_REGFORM_SETTINGS' => "Einstellungen am Anmeldeformular", - 'LEAST_CATS' => "Mindestens auszuwählende Kategorieanzahl", + 'LEAST_CATEGORIES' => "Mindestens auszuwählende Kategorieanzahl", 'CATS_LEAST' => "Bitte wählen Sie mehr Kategorien aus! Minimum ist: {?least_cats?}", 'EMAIL_ALREADY_DB' => "Sie haben sich bereits mit dieser Email-Adresse angemeldet, oder jemand anderes verwendet Ihre. Doppelte Anmeldungen sind bei uns verboten.", 'REJECT_DOUBLE_EMAIL' => "Doppelt angemeldete Email-Adressen ablehnen?", @@ -264,10 +264,10 @@ addMessages(array( 'GUEST_BIRTHDAY' => "Geburtsdatum", 'GUEST_REF' => "Geworben von", 'GUEST_YOUR_REFLINK' => "Hier ist Ihr persönlicher Referal-Link, mit dem Sie bereits jetzt schon neue Mitglieder werben können:", - 'GUEST_SUBJECT_CONFIRM_LINK' => "Ihr Bestätigungslink", + 'GUEST_CONFIRM_LINK_SUBJECT' => "Ihr Bestätigungslink", 'ADMIN_GUEST_REGISTERED_WITH_US' => "Ein Gast hat sich soeben bei uns angemeldet.", 'ADMIN_GUEST_PERSONA_DATA' => "Hier sind zur Überprüfung nochmals seine persönlichen Daten", - 'ADMIN_SUBJECT_NEW_ACCOUNT' => "Neue Anmeldung zu Ihrem {?mt_word?}", + 'ADMIN_NEW_ACCOUNT_SUBJECT' => "Neue Anmeldung zu Ihrem {?mt_word?}", 'REGISTRATION_DONE' => "Vielen Dank für die Anmeldung. Ein Bestätigungslink ist zur angemeldeten EMail-Adresse unterwegs.", 'GUEST_404_WHAT' => "Das angegeben Menümodul %s existiert leider nicht, oder dieses Script hat einen Fehler gemacht.", 'GUEST_LOCKED_ACTION' => "Aktionsmodul %s wurde gesperrt.", @@ -348,10 +348,10 @@ addMessages(array( 'MEMBER_UID' => "Seine Login-Id lautet", 'LOGOUT_DONE' => "Ausloggen abgeschlossen.", 'LOGOUT_FAILED' => "Ausloggen fehlgeschlagen.", - 'MEMBER_NO_CATS' => "Es wurden bis jetzt noch keine Kategorien eingerichtet.", + 'MEMBER_NO_CATEGORIES' => "Es wurden bis jetzt noch keine Kategorien eingerichtet.", 'SELECT_CAT' => "Mails aus Kategorie empfangen?", - 'MEMBER_CATS_SAVED' => "Kategorien gespeichert.", - 'MEMBER_CATS_NOT_SAVED' => "Kategorien wurden nicht geändert.", + 'MEMBER_CATEGORIES_SAVED' => "Kategorien gespeichert.", + 'MEMBER_CATEGORIES_NOT_SAVED' => "Kategorien wurden nicht geändert.", 'YOUR_PERSONAL_REFLINK' => "Ihr persönlicher Ref-Link zum Werben neuer Mitglieder lautet", 'YOUR_REFCLICKS' => "Klicks auf Ihren Referal-Link", 'CLICKS' => "Klicks", @@ -407,7 +407,7 @@ addMessages(array( 'UNKNOWN_CODE' => "Es ist während der Ausführung ein unbekannter Fehler-Code %s enstanden, für den Sie vermutlich nicht verantwortlich sind. Bitte informieren Sie uns über diese Meldung.", 'MEMBER_TEXT_CONTAINS_URL' => "Ihr Werbetext enthält eine URL, dies ist in unserem {?mt_word?} nicht zulässig. Bitte entfernen Sie diese aus Ihrem Text und versuchen Sie es erneut.", 'MEMBER_TEXT_OVERLENGTH' => "Ihr Text hat die maximale Textlänge überschritten. Bitte fassen Sie ihn etwas kürzer.", - 'MEMBER_SUBJ_CONTAINS_URL' => "Ihre eingegebe Betreffzeile enthält eine URL, dies ist in unserem {?mt_word?} nicht zulässig. Bitte entfernen Sie diese aus Ihrer Betreffzeile und versuchen Sie es erneut.", + 'MEMBER_SUBJECT_CONTAINS_URL' => "Ihre eingegebe Betreffzeile enthält eine URL, dies ist in unserem {?mt_word?} nicht zulässig. Bitte entfernen Sie diese aus Ihrer Betreffzeile und versuchen Sie es erneut.", 'MEMBER_URL_BLACK_LISTED' => "Ihre eingegebene URL wurde in unsere Ausschlussliste aufgenommen.", 'MEMBER_BLIST_TIME' => "Datum der Sperrung war", 'MEMBER_SELECTED_MORE_RECS' => "Sie haben für diese Kategorie zu viele Empfänger eingegeben.", @@ -461,7 +461,7 @@ addMessages(array( 'ADMIN_EDIT_EMAIL' => "Mailbuchung bearbeiten", 'ADMIN_CHANGE_EMAIL' => "Änderungen speichern", 'EDIT_URL' => "URL bearbeiten", - 'EMAIL_EDIT_SUBJ' => "Betreff bearbeiten", + 'EMAIL_EDIT_SUBJECT' => "Betreff bearbeiten", 'EMAIL_EDIT_TEXT' => "Werbetext bearbeiten", 'ADMIN_UNLOCK_EMAILS' => "Neue Mailbuchungen freischalten", 'EMAIL_ACCEPT' => "Annehmen", @@ -473,11 +473,11 @@ addMessages(array( 'ADMIN_URLS_BLOCKED' => "URLs wurden in die Black-List aufgenommen.", 'ADMIN_SENDING_DONE' => "Eine gebuchte Mail wurde soeben vollständig ausgesendet. Das werbende Mitglied wurde darüber in Kenntnis gesetzt.", 'ADMIN_NOTIFY_DONE' => "Sollte diese Buchung nicht Ihren AGBs entsprechen, loggen Sie sich bitte in den Admin-Bereich ein und aendern die Mail.", - 'ADMIN_SUBJ_SEND_DONE' => "Vollständig: Aussendung einer Werbebbuchung.", + 'ADMIN_SEND_DONE_SUBJECT' => "Vollständig: Aussendung einer Werbebbuchung.", 'MEMBER_SENDING_DONE' => "Ihre gebuchte Mail wurde soeben vollständig von unserem System versendet! Wir wünschen Ihnen viel Erfolg mit Ihrer Werbebuchung.", 'MEMBER_NOTIFY_DONE' => "Den weiteren Verlauf dieser Werbebuchung können Sie im Mitgliedsbereich unter Statistiken verfolgen.", - 'MEMBER_SUBJ_SEND_DONE' => "Ihre Werbebuchung wurde versandt", - 'GUEST_SELECT_LEAST_CATS' => "Bitte wählen Sie mindestens {?least_cats?} Kategorien aus. Anderfalls erfolgt keine Anmeldung.", + 'MEMBER_SEND_DONE_SUBJECT' => "Ihre Werbebuchung wurde versandt", + 'GUEST_SELECT_LEAST_CATEGORIES' => "Bitte wählen Sie mindestens {?least_cats?} Kategorien aus. Anderfalls erfolgt keine Anmeldung.", 'MEMBER_POOL_CONTENT' => "Ihre Mails im Sende-Pool", 'MEMBER_STATS_CONTENT' => "Statistiken versandter Mails", 'EMAIL_END_SEND' => "Vollständig versendet", @@ -521,14 +521,14 @@ addMessages(array( 'ADMIN_EDIT_USER' => "Ändern", 'ADMIN_ALL_REFS' => "Alle Refs auflisten", 'BIRTHDAY2' => "Geburtstag", - 'TOTAL_CATS' => "Ausgewählte Kategorien", + 'TOTAL_CATEGORIES' => "Ausgewählte Kategorien", 'ADMIN_GOTO_USERLIST' => "Dieser Menüpunkt kann nicht direkt aufgerufen werden. Bitte rufen Sie stattdessen User auflisten auf.", 'ADMIN_USER_UPDATED' => "Das Mitgliedsaccount wurde aktualisiert.", 'ADMIN_LOCKED_YOUR_ACCOUNT' => "Ihr Account wurde von einem unserer Administratoren gesperrt! Bitte halten Sie sich an unsere AGBs.", 'REASON_LOCKED' => "Grund der Sperrung war", 'MEMBER_PLEASE_RESPECT' => "Sollten Sie damit nicht einverstanden sein, so melden Sie sich bitte bei uns. Wir kommen dann in Kontakt mit Ihnen.", - 'ADMIN_LOCKED_SUBJ' => "Ihr Account wurde gesperrt.", - 'ADMIN_UNLOCKED_SUBJ' => "Ihr Account wurde wieder freigegeben.", + 'ADMIN_LOCKED_SUBJECT' => "Ihr Account wurde gesperrt.", + 'ADMIN_UNLOCKED_SUBJECT' => "Ihr Account wurde wieder freigegeben.", 'REASON_UNLOCKED' => "Nachricht vom Admin", 'ADMIN_WELCOME_BACK' => "Bitte beachten Sie beim naechsten Mal auf unsere AGBs, damit Ihnen diese Unangenehmlichkeiten erspart bleiben.", 'ADMIN_DEL_ACCOUNT' => "Loeschung Ihres Accounts.", @@ -536,7 +536,7 @@ addMessages(array( 'REASON_DELETE' => "Grund der Löschung war folgender", 'ADMIN_BYE_BYE' => "Wir wünschen Ihnen weiterhin noch alles Gute und können Sie vielleicht irgentwann einmal wieder begruessen.", 'ADMIN_ALL_CONFIRMED_EMAIL' => "Alle Ihre Mitglieder haben ihre Email-Adresse bestätigt! Keine Neuanmeldungen vorhanden.", - 'GUEST_CONFIRM_SUBJ' => "Bitte Ihre Email-Adresse bestätigen.", + 'GUEST_CONFIRM_SUBJECT' => "Bitte Ihre Email-Adresse bestätigen.", 'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet", 'MEMBER_ORDER_REJECTED' => "Ihre Mailbuchung wurde abgelehnt", 'THANX_REFERAL_ONE_SUBJECT' => "Vielen Dank für die Referal-Werbung.", @@ -553,7 +553,7 @@ addMessages(array( 'ADMIN_SELECT_USER' => "Mitglied auswählen", 'ENTER_POINTS_ADD' => "{?POINTS?} zum Aufbuchen", 'ENTER_ADD_REASON' => "Grund der Aufbuchung", - 'ADMIN_ADD_SUBJ' => "{?POINTS?}-Gutschrift durch unsere Admins.", + 'ADMIN_ADD_SUBJECT' => "{?POINTS?}-Gutschrift durch unsere Admins.", 'ADMIN_POINTS_ADDED' => "{?POINTS?} wurden gutgeschrieben. Das Mitglied hat eine Mail erhalten.", 'MAILS_PER_DAY' => "Mitglieder-Mails / Tag", 'GUEST_CONFIRMED_DONE' => "Danke für die Bestätigung Ihrer Email-Adresse! Es ist eine Mail mit den Login-Daten zu Ihnen unterwegs.", @@ -581,12 +581,12 @@ addMessages(array( 'EDIT_CATEGORIES' => "Kategorien ändern", 'CATEGORY_ID' => "Kategorie-Id", 'CAT_DESCRIPTION' => "Kategoriebeschreibung", - 'CHANGE_CATS' => "Ändern", + 'CHANGE_CATEGORIES' => "Ändern", 'SORT_KEY' => "Sortierung", 'CATEGORIES_SAVED' => "Kategorien gespeichert...", 'CATEGORIES_DELETED' => "Kategorien gelöscht...", 'DELETE_CATEGORIES' => "Kategorien löschen", - 'REMOVE_CATS' => "Löschen", + 'REMOVE_CATEGORIES' => "Löschen", 'EDIT_MRECEIVE' => "Maximal-Werte editieren", 'DELETE_MRECEIVE' => "Maximal-Werte löschen", 'MRECEIVE_ID' => "Max-Wert id", @@ -622,15 +622,15 @@ addMessages(array( 'KBYTES' => "KBytes", 'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}", 'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.", - 'ADMIN_MEMBER_NO_CATS_1' => "Das Mitglied ", - 'ADMIN_MEMBER_NO_CATS_2' => " hat keine Kategorien ausgewählt.", + 'ADMIN_MEMBER_NO_CATEGORIES_1' => "Das Mitglied ", + 'ADMIN_MEMBER_NO_CATEGORIES_2' => " hat keine Kategorien ausgewählt.", 'USER_ID' => "Mitglied", 'UNCONFIRMED_LINKS' => "Unbestätigte Mails", 'ADMIN_MEMBER_LINKS' => "Das Mitglied %s hat alle seine Mails bestätigt.", 'MEMBER_TOTAL_LINKS' => "Es müssen noch %s Mails von diesem Mitglied bestätigt werden.", 'ADMIN_DEL_UNCONFIRMED_LINKS' => "Alle unbestätigten Mails löschen", 'ADMIN_LINKS_DELETED' => "Links für unbestätigte Mails wurden gelöscht.", - 'ADMIN_DEL_LINK_SUBJ' => "Ihr unbestätigen Mails wurden gelöscht.", + 'ADMIN_DEL_LINK_SUBJECT' => "Ihr unbestätigen Mails wurden gelöscht.", 'MEMBER_LINKS_LEFT' => "Sie haben %s unbestätigte Mails. Bitte bestätigen Sie diese zuerst. Wenn Sie weniger als {?unconfirmed?} Mails im Account haben, können Sie auch wieder buchen.", 'TODAY' => "Heute", 'MEMBER_PROFILE_LOCKED' => "Sie können Ihren Account erst am %s wieder ändern.", @@ -690,7 +690,7 @@ addMessages(array( 'LOAD_URL_ERROR_2' => "\">Bitte klicken Sie hier, um zur URL zu kommen.
\n
\nDanke.", 'GUEST_STATS' => "Statistiken unseres {?mt_word2?}", 'GUEST_STATS_MONTHLY' => "Mitgliederverteilung auf Kalendermonate", - 'GUEST_STATS_CATS' => "Mitgliederverteilung auf Mail-Kategorien", + 'GUEST_STATS_CATEGORIES' => "Mitgliederverteilung auf Mail-Kategorien", 'GUEST_STATS_MALES' => "Angemeldete Männer", 'GUEST_STATS_FEMALES' => "Angemeldete Frauen", 'GUEST_STATS_TONLINE' => "Heute Online gewesen", @@ -707,7 +707,7 @@ addMessages(array( 'BASE_URL_NOTE' => "Ohne abschliessendem /.", 'ADMIN_WRONG_CALL' => "Falscher Aufruf einer Aktion oder des Scriptes. Bitte navigieren Sie links weiter.", 'ADMIN_IS_SYSTEM_TASK' => "System-Task", - 'ADMIN_NEW_EXTENSION_SUBJ' => "Neue Erweiterung gefunden", + 'ADMIN_NEW_EXTENSION_SUBJECT' => "Neue Erweiterung gefunden", 'ADMIN_TASK_SUBJECT' => "Aufgabenbetreff", 'ADMIN_TASK_TEXT' => "Aufgabentext", 'ADMIN_REGISTER_EXTENSION' => "Registrieren", @@ -754,7 +754,7 @@ addMessages(array( 'REQUEST_CONFIRM_LINK' => "Erneut anfordern", 'LOGIN_ID_CONFIRMED' => "Sie haben bereits Ihre E-Mail Adresse bestätigt.", 'CONFIRM_LINK_SENT' => "Der Bestätigungslink wurde an Ihre E-Mail Adresse ausgesandt.", - 'REQUEST_CONFIRM_LINK_SUBJ' => "Anforderung Ihres Bestätigunglinkes", + 'REQUEST_CONFIRM_LINK_SUBJECT' => "Anforderung Ihres Bestätigunglinkes", 'EMAIL_404' => "Unter der angegebenen E-Mail Adresse konnten wir keinen Account finden! Bitte versuchen Sie es erneut.", 'SELECT_NONE' => "Keine/s/r", 'ADMIN_SETUP_STATS_TITLE' => "Einstellungen an den Gast-Statistiken", @@ -767,7 +767,7 @@ addMessages(array( 'DELETE_PAYMENT' => "Vergütungen löschen", 'REF_PAYOUT' => "Wie viele Mails müssen die Mitglieder mindestens bestätigen, um den Willkommensbonus, einmaliger Referal-Bonus usw. gutgeschrieben zu bekommen?", 'ADMIN_EXTENSION_UPDATED' => "Erweiterung aktualisiert.", - 'ADMIN_UPDATE_EXTENSION_SUBJ' => "Erweiterung-Update installiert", + 'ADMIN_UPDATE_EXTENSION_SUBJECT' => "Erweiterung-Update installiert", 'MEMBER_ORDER_PAGE1_INTRO' => "Mailbuchung - Schritt 1 von 4: PLZ eingeben", 'MEMBER_ORDER_PAGE2_INTRO' => "Mailbuchung - Schritt 2 von 4: Daten eingeben", 'MEMBER_ORDER_PAGE3_INTRO' => "Mailbuchung - Schritt 3 von 4: Frame-Killer Test und Absenden", @@ -920,7 +920,7 @@ addMessages(array( '_OR' => "oder", 'GUEST_NEW_PASSWORD_SEND' => "Neues Passwort ist zu Ihrem Postfach unterwegs.", 'UNDER_CONSTRUCTION' => "Funktion noch im Aufbau.", - 'ADMIN_SUB_SUBJ' => "{?POINTS?}-Abzug durch unsere Admins", + 'ADMIN_SUB_SUBJECT' => "{?POINTS?}-Abzug durch unsere Admins", 'ADMIN_POINTS_SUBTRACTED' => "{?POINTS?} wurden erfolgreich abgezogen.", 'ADMIN_ALL_POINTS_SUBTRACTED' => "Allen Mitgliedern wurden {?POINTS?} abgezogen.", 'ADMIN_SUB_POINTS_FROM_USER' => "Abzug von {?POINTS?} eines Mitgliedes", @@ -1020,7 +1020,7 @@ addMessages(array( 'ADMIN_CONFIG_MAILID_REDIRECT_INDEX' => "Auf Hauptseite weiterleiten.", 'ADMIN_CONFIG_MAILID_REDIRECT_REJECT' => "Auf Ablehnungsseite umleiten.", 'REASON_DIRECT_PAYMENT' => "Direkte Gutschrift (siehe evtl. vorangegangene Mail)", - 'SUBJECT_DIRECT_PAYMENT' => "Direkte {?POINTS?}-Gutschrift durch das System", + 'DIRECT_PAYMENT_SUBJECT' => "Direkte {?POINTS?}-Gutschrift durch das System", 'ADMIN_LOGOUT_SQL_PATCHES_DONE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung sql_patches installiert haben und dabei das Passort-Hashing geändert/verbessert wurde. Bitte erneut einloggen.", 'ADMIN_LOGOUT_SQL_PATCHES_REMOVE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung sql_patches entfernt haben. Bitte klicken Sie weiter, um jetzt das Passwort neu zu setzen.", 'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied %s {?POINTS?} zurückgeschrieben.", @@ -1071,7 +1071,7 @@ addMessages(array( 'ADMIN_RESET_PASS' => "Ihr Administratorkennwort zurücksetzen?", 'ADMIN_NO_LOGIN_WITH_EMAIL' => "Kein Administrator-Account mit der angegebenen Email-Adresse gefunden.", - 'ADMIN_RESET_PASS_LINK_SUBJ' => "Zurücksetzung Ihres Admin-Passwortes", + 'ADMIN_RESET_PASS_LINK_SUBJECT' => "Zurücksetzung Ihres Admin-Passwortes", 'ADMIN_RESET_LINK_SENT' => "Der Reset-Link wurde soeben an Ihre eingegebene Email-Adresse ausgesendet.", 'ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED' => "Validierung Ihrer Logindaten fehlgeschlagen. Haben Sie auch den Link aus der Mail angeklickt und Ihren Loginnamen eingegeben?", 'ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2' => "Validierung Ihrer Logindaten fehlgeschlagen. Es liegt ein Bug im Script vor. Bitte im Bug-Tracker den Fehler melden.", @@ -1119,8 +1119,8 @@ addMessages(array( 'EXTENSION' => "Erweiterung", 'MOD_REWRITE_ERROR' => "Sie müssen mod_rewrite in Apache aktiviert haben um die Erweiterung rewrite nutzen zu können.", 'ADMIN_BUILD_STATUS_HANDLER' => "Status-Handler", - 'TASK_SUBJ_EXTENSION_DEACTIVATED' => "Erweiterung deaktiviert", - 'ADMIN_SUBJECT_EXTENSION_DEACTIVATED' => "Automatische Deaktivierung einer Erweiterung", + 'ADMIN_TASK_EXTENSION_DEACTIVATED_SUBJECT' => "Erweiterung deaktiviert", + 'ADMIN_EXTENSION_DEACTIVATED_SUBJECT' => "Automatische Deaktivierung einer Erweiterung", 'FATAL_EXTENSION_LOADED' => "Erweiterung %s bereits geladen.", 'ADMIN_ACCESS_DENIED' => "Zugriff auf den Adminmenüpunkt %s nicht gestattet.", 'ADMIN_URL_BLACKLIST_DISABLED' => "URL-Sperrliste ist deaktiviert.", diff --git a/inc/language/holiday_de.php b/inc/language/holiday_de.php index bf561b051a..405d78429c 100644 --- a/inc/language/holiday_de.php +++ b/inc/language/holiday_de.php @@ -52,18 +52,18 @@ addMessages(array( 'HOLIDAY_COMMENTS' => "Sonstige Hinweise an uns", 'HOLIDAY_NOTES' => "Sobald Sie das Formular abgeschickt haben, wird die Urlaubsschaltung für Ihren Account aktiviert. Sie können sich weiterhin im Mitgliedsbereich aufhalten, können aber keine Mails mehr empfangen und auch selber keine mehr buchen.", 'ADMIN_TASK_IS_HOLIDAY_REQUEST' => "Urlaubsanfrage", - 'HOLIDAY_ADMIN_NOTHING_FOUND' => "Niemand hat Urlaub beantragt.", - 'HOLIDAY_ADMIN_TSTART' => "Anfang", - 'HOLIDAY_ADMIN_TEND' => "Ende", - 'HOLIDAY_ADMIN_COMMENTS' => "Kommentar", - 'HOLIDAY_ADMIN_STOP_CHECKED' => "Ausgew. Urlaub beenden", - 'HOLIDAY_ADMIN_DELETE_NOTE' => "Bitte beachten Sie, dass beim vorzeitigen Beenden des Urlaubes der Account-Status nicht geändert wird. Ist also das Account noch gesperrt, müssen Sie es seperat freischalten.", + 'ADMIN_HOLIDAY_NOTHING_FOUND' => "Niemand hat Urlaub beantragt.", + 'ADMIN_HOLIDAY_TSTART' => "Anfang", + 'ADMIN_HOLIDAY_TEND' => "Ende", + 'ADMIN_HOLIDAY_COMMENTS' => "Kommentar", + 'ADMIN_HOLIDAY_STOP_CHECKED' => "Ausgew. Urlaub beenden", + 'ADMIN_HOLIDAY_DELETE_NOTE' => "Bitte beachten Sie, dass beim vorzeitigen Beenden des Urlaubes der Account-Status nicht geändert wird. Ist also das Account noch gesperrt, müssen Sie es seperat freischalten.", 'HOLIDAY_NO_DIRECT_CALL' => "Bite rufen Sie dieses Script über Auflisten auf.", - 'HOLIDAY_ADMIN_DEL_LINK' => "Urlaub beenden", - 'HOLIDAY_ADMIN_SINGLE_DELETED' => "Urlaub eines Mitgliedes beendet.", - 'HOLIDAY_ADMIN_MULTI_DEL' => "Urlaub von %s Mitglied(-ern) beendet.", - 'HOLIDAY_ADMIN_CONFIG_HEADER' => "Einstellungen an der Urlaubsschaltung", - 'HOLIDAY_ADMIN_MAX_HOLIDAY' => "Maximale beantragbare Urlaubszeit", + 'ADMIN_HOLIDAY_DEL_LINK' => "Urlaub beenden", + 'ADMIN_HOLIDAY_SINGLE_DELETED' => "Urlaub eines Mitgliedes beendet.", + 'ADMIN_HOLIDAY_MULTI_DEL' => "Urlaub von %s Mitglied(-ern) beendet.", + 'ADMIN_HOLIDAY_CONFIG_HEADER' => "Einstellungen an der Urlaubsschaltung", + 'ADMIN_HOLIDAY_MAX_HOLIDAY' => "Maximale beantragbare Urlaubszeit", 'HOLIDAY_IS_ACTIVATED_NOW' => "Ihre Urlaubsschaltung wurde jetzt aktiviert. Sie können keine Mails mehr buchen.", 'HOLIDAY_MEMBER_DEACTIVATE_TITLE' => "Bestehende Urlaubsschaltung deaktivieren", 'HOLIDAY_DEACTIVATE_NOTES' => "Möchten Sie diese Urlaubsschaltung wieder deaktivieren? Es ist eine weitere Mail dann an uns unterwegs.", @@ -74,21 +74,21 @@ addMessages(array( 'HOLIDAY_MEMBER_TLOCK' => "Urlaubsschaltung eingerichtet", 'HOLIDAY_MEMBER_LOCKED' => "Sie können derzeit Ihre Urlaubsschaltung nicht wieder deaktivieren, da Sie diese erst vor Kurzem aktiviert haben.", 'HOLIDAY_MEMBER_ORDER' => "Sie können derzeit Ihre Urlaubsschaltung nicht verändern, da Ihre letzte Mailbuchung zu kurz her ist! Letzte Buchung: %s", - 'HOLIDAY_ADMIN_SINGLE_404' => "Urlaubsschaltung nicht mehr vorhanden, oder veralteter Link.", - 'HOLIDAY_ADMIN_LOCKED' => "Dauer bis Urlaubsschaltung aufgehoben werden kann", - 'HOLIDAY_ADMIN_MODE' => "Zeitpunkt der Abarbeitung der Urlaubsschaltungen", - 'HOLIDAY_ADMIN_MODE_RESET' => "Am täglichen Reset um 00:00 Uhr", - 'HOLIDAY_ADMIN_MODE_DIRECT' => "Sofort nach Beantragung prüfen", + 'ADMIN_HOLIDAY_SINGLE_404' => "Urlaubsschaltung nicht mehr vorhanden, oder veralteter Link.", + 'ADMIN_HOLIDAY_LOCKED' => "Dauer bis Urlaubsschaltung aufgehoben werden kann", + 'ADMIN_HOLIDAY_MODE' => "Zeitpunkt der Abarbeitung der Urlaubsschaltungen", + 'ADMIN_HOLIDAY_MODE_RESET' => "Am täglichen Reset um 00:00 Uhr", + 'ADMIN_HOLIDAY_MODE_DIRECT' => "Sofort nach Beantragung prüfen", 'HOLIDAY_MEMBER_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Mitglieder-Id %s nicht gefunden.", // Subject lines 'HOLIDAY_MEMBER_SUBJECT' => "[HINWEIS:] Ihre Urlaubsanfrage", - 'HOLIDAY_ADMIN_SUBJECT' => "Urlaubsanfrage in Ihrem {?mt_word?}", - 'HOLIDAY_MEMBER_UNLOCK_SUBJ' => "[HINWEIS:] Beendigung Ihres Urlaubes", - 'HOLIDAY_ADMIN_UNLOCK_SUBJ' => "Automatische Urlaubsbeendigung", - 'HOLIDAY_ADMIN_DEAC_SUBJ' => "Deaktivierung einer Urlaubsschaltung", - 'HOLIDAY_ADMIN_REMOVED_SUBJ' => "[HINWEIS:] Ihr Urlaub wurde beendet", - 'HOLIDAY_MEMBER_ACTIVATED_SUBJ' => "[HINWEIS:] Ihre Urlaubsschaltung ist aktiviert", + 'ADMIN_HOLIDAY_SUBJECT' => "Urlaubsanfrage in Ihrem {?mt_word?}", + 'HOLIDAY_MEMBER_UNLOCK_SUBJECT' => "[HINWEIS:] Beendigung Ihres Urlaubes", + 'ADMIN_HOLIDAY_UNLOCK_SUBJECT' => "Automatische Urlaubsbeendigung", + 'ADMIN_HOLIDAY_DEAC_SUBJECT' => "Deaktivierung einer Urlaubsschaltung", + 'ADMIN_HOLIDAY_REMOVED_SUBJECT' => "[HINWEIS:] Ihr Urlaub wurde beendet", + 'HOLIDAY_MEMBER_ACTIVATED_SUBJECT' => "[HINWEIS:] Ihre Urlaubsschaltung ist aktiviert", )); // [EOF] diff --git a/inc/language/mods_de.php b/inc/language/mods_de.php index 12ad25c98d..8c689875a6 100644 --- a/inc/language/mods_de.php +++ b/inc/language/mods_de.php @@ -44,18 +44,18 @@ if (!defined('__SECURITY')) { // Language definitions addMessages(array( - 'MODS_NAME' => "Modulname", - 'MODS_TITLE' => "Modultitel", - 'MODS_IS_LOCKED' => "Gesperrt", - 'MODS_IS_HIDDEN' => "Verdeckt", - 'MODS_IS_ADMIN' => "Nur Admin", - 'MODS_IS_MEMBER' => "Nur Mitglied", - 'MODS_CLICKS' => "Klicks", - 'MODS_EDIT' => "Module ändern", - 'MODS_ADMIN_EDIT_NOTE' => "Klicken Sie auf den Modulnamen, um Statistiken zu den verknüpften Menüpunkten zu erhalten.", - 'MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul auswählen.", - 'MODS_CHANGED' => "Module wurden geändert.", - 'MODS_WHAT_ACTION' => "Menüpunkt (Hauptmenü)", + 'ADMIN_MODS_NAME' => "Modulname", + 'ADMIN_MODS_TITLE' => "Modultitel", + 'ADMIN_MODS_IS_LOCKED' => "Gesperrt", + 'ADMIN_MODS_IS_HIDDEN' => "Verdeckt", + 'ADMIN_MODS_IS_ADMIN' => "Nur Admin", + 'ADMIN_MODS_IS_MEMBER' => "Nur Mitglied", + 'ADMIN_MODS_CLICKS' => "Klicks", + 'ADMIN_MODS_EDIT' => "Module ändern", + 'ADMIN_MODS_EDIT_NOTE' => "Klicken Sie auf den Modulnamen, um Statistiken zu den verknüpften Menüpunkten zu erhalten.", + 'ADMIN_MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul auswählen.", + 'ADMIN_MODS_CHANGED' => "Module wurden geändert.", + 'ADMIN_MODS_WHAT_ACTION' => "Menüpunkt (Hauptmenü)", 'ADMIN_MODS_STATS_FOOTER' => "Hier soll ein Hinweis hinkommen.", )); diff --git a/inc/language/nickname_de.php b/inc/language/nickname_de.php index 7d1ecf1ace..7dbb2f7482 100644 --- a/inc/language/nickname_de.php +++ b/inc/language/nickname_de.php @@ -56,7 +56,7 @@ addMessages(array( 'NICKNAME_YOUR_REFLINK' => "Ihr Nickname-Reflink", 'NO_NICKNAME_SET' => "Sie haben noch keinen Nickname eingerichtet! Damit können Sie sich alternativ zur Mitglieder-Id einloggen.", 'PLEASE_CLICK_NICKNAME_FORM' => "Hier können Sie sich nun einen einrichten...", - 'NICKNAME_ADMIN_CONFIG_HEADER' => "Einstellungen am Nicknamen", + 'ADMIN_NICKNAME_CONFIG_HEADER' => "Einstellungen am Nicknamen", 'ADMIN_NICKNAME_MIN_LENGTH' => "Minimale Länge", 'ADMIN_NICKNAME_PATTERN' => "Pattern für isInString()-Befehl", 'ADMIN_NICKNAME_LANG_CHARS' => "Zeichenfolge für Sprachdatei", diff --git a/inc/language/order_de.php b/inc/language/order_de.php index f3995742fd..01da57a44e 100644 --- a/inc/language/order_de.php +++ b/inc/language/order_de.php @@ -56,7 +56,7 @@ addMessages(array( 'ADMIN_OPTION_MAX_TEXT_LENGTH' => "Maximale Länge des Werbetextes", 'ADMIN_OPTION_MAX_UNCONFIRMED_MAILS' => "Maximale Anzahl unbest. Mails (Mailbuchung)", 'ADMIN_OPTION_CHECK_EMAIL_TEXT' => "Sind URLs im Werbetext erlaubt?", - 'ADMIN_OPTION_CHECK_EMAIL_SUBJ' => "Sind URLs in der Betreffzeile erlaubt?", + 'ADMIN_OPTION_CHECK_EMAIL_SUBJECT' => "Sind URLs in der Betreffzeile erlaubt?", 'ADMIN_OPTION_URL_BLACKLIST' => "Black-Liste für gebuchte URLs aktivieren?", 'MEMBER_ORDER_ALLOWED_RECEIVE' => "Sie können heute noch %s von %s Mailbuchungen aufgeben.", @@ -85,9 +85,9 @@ addMessages(array( 'MEMBER_AUTOSEND_ACTIVE' => "Der Auto-Versand ist in unserem {?mt_word?} derzeit aktiviert. Ihr Mailbuchung wurde aktiviert und wird bald automatisch versant.", // Repay deleted mails constants - 'ADMIN_CFG_REPAY_POINTS_REPAY' => "Dem Mitglied wieder gutschreiben", - 'ADMIN_CFG_REPAY_POINTS_JACKPOT' => "In den Jackpot legen", - 'ADMIN_CFG_REPAY_POINTS_SHRED' => "Nicht gutschreiben (verfällt dann)", + 'ADMIN_CONFIG_REPAY_POINTS_REPAY' => "Dem Mitglied wieder gutschreiben", + 'ADMIN_CONFIG_REPAY_POINTS_JACKPOT' => "In den Jackpot legen", + 'ADMIN_CONFIG_REPAY_POINTS_SHRED' => "Nicht gutschreiben (verfällt dann)", 'ADMIN_REPAY_ON_DELETE_MODE' => "Wenn Sie eine Mailbuchung löschen, wie sollen die ausgegebenen {?POINTS?} gehandhabt werden?", 'ADMIN_TASK_IS_MEMBER_ORDER' => "Mailbuchung vom Mitglied", diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index 6c45204bc7..b887ef1049 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -80,7 +80,7 @@ addMessages(array( 'ADMIN_PAYOUT_LIST_REQUESTS' => "Jetzt alle Auszahlungsanfragen auflisten.", 'ADMIN_PAYOUT_TRANSFER_FAILED' => "Transfer nicht abgeschlossen:", 'ADMIN_PAYOUT_ALLOW_URLS' => "URLs erlauben", - 'ADMIN_PAYOUY_REQUEST_SUBJ' => "Auszahlungsanfrage eines Mitgliedes", + 'ADMIN_PAYOUY_REQUEST_SUBJECT' => "Auszahlungsanfrage eines Mitgliedes", 'ADMIN_LIST_PAYOUTS' => "Alle Auszahlungen nach Mitgliedern auflisten", 'ADMIN_PAYOUT_DELETE_ALL_REQUESTS' => "Alle Anfragen *SOFORT* löschen", 'ADMIN_PAYOUT_OBTAIN_ID_FAILED' => "Konnte id nicht finden! Bitte links im Menü diese Anfrage aufsuchen.", @@ -115,7 +115,7 @@ addMessages(array( 'MEMBER_PAYOUT_TARGET_ACCOUNT' => "An Accountnummer", 'MEMBER_PAYOUT_TARGET_BANK' => "Bankleitzahl (od. Klamm)", 'MEMBER_PAYOUT_MEMBER_NOTE' => "Accountnummer kann Ihre Kontonummer bei der Bank, Klamm-Id oder Ihre id bei der Empfänger-Webseite sein. Bitte beachten Sie weitere Hinweise dieses {?mt_word2?}.", - 'MEMBER_PAYOUT_REQUEST_SUBJ' => "Ihre Auszahlungsanfrage an uns", + 'MEMBER_PAYOUT_REQUEST_SUBJECT' => "Ihre Auszahlungsanfrage an uns", 'MEMBER_PAYOUT_REQUEST_SENT' => "Auszahlungsanfrage wurde versendet ...", 'MEMBER_PAYOUT_TARGET_ACCOUNT2' => "Ziel-Account", 'MEMBER_PAYOUT_TARGET_BANK2' => "Ziel-Bank", diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php index d73ff34175..458a458e51 100644 --- a/inc/language/rallye_de.php +++ b/inc/language/rallye_de.php @@ -118,13 +118,13 @@ addMessages(array( 'RALLYE_EXPIRE_ONE_DAY' => "Rallye endet in weniger als 24 Stunden.", 'RALLYE_HAS_EXPIRED' => "Diese Referal-Rallye ist beendet.", 'RALLYE_ADMIN_EXPIRED' => "Rallye beendet", - 'RALLYE_ADMIN_EXPIRED_SUBJ' => "Rallye beendet: %s", - 'RALLYE_MEMBER_EXPIRED_SUBJ' => "REF-RALLYE BEENDET: %s. Platz", + 'RALLYE_ADMIN_EXPIRED_SUBJECT' => "Rallye beendet: %s", + 'RALLYE_MEMBER_EXPIRED_SUBJECT' => "REF-RALLYE BEENDET: %s. Platz", 'RALLYE_YOU_CAN_WIN' => "Was Sie gewinnen können", 'RALLYE_OUR_WINNERS_ARE' => "Unsere Gewinner sind dieses Mal", 'RALLYE_PRICE_IS' => "Hat gewonnen", 'RALLYE_HAPPY_WINNERS' => "Wir gratulieren allen Gewinnern.", - 'RALLYE_ADMIN_PURGED_SUBJ' => "[HINWEIS:] Referal-Rallye '%s' entfernt", + 'RALLYE_ADMIN_PURGED_SUBJECT' => "[HINWEIS:] Referal-Rallye '%s' entfernt", 'RALLYE_ADMIN_EXPIRED_TEXT' => "Eine Referal-Rallye ist beendet worden. Bitte kontrollieren Sie diese und führen Sie ggf. weitere Schritte durch.", 'RALLYE_ADMIN_PURGED_TEXT' => "Eine oder mehr Referal-Rallye(s) ist/sind gelöscht worden.", 'RALLYE_EDIT_RALLYES' => "Rallye-Grunddaten ändern", diff --git a/inc/language/register_de.php b/inc/language/register_de.php index af5406dd50..0a919ff861 100644 --- a/inc/language/register_de.php +++ b/inc/language/register_de.php @@ -57,8 +57,8 @@ addMessages(array( 'REGISTER_ZIP_REQUIRED' => "Bitte geben Sie die Postleitzahl ein.", 'REGISTER_CITY_REQUIRED' => "Bitte geben Sie den Wohnort ein.", 'CNTRY' => "Ländercode", - 'ADMIN_CFG_REGISTER_DEFAULT' => "Standart-Vorauswahl in der Kategorienliste einstellen auf Ja/Nein", - 'ADMIN_CFG_REGISTER_DISPLAY_REFID' => "Soll die Ref-Id angezeigt werden?
(Nein = id wird editierbar!)
", + 'ADMIN_CONFIG_REGISTER_DEFAULT' => "Standart-Vorauswahl in der Kategorienliste einstellen auf Ja/Nein", + 'ADMIN_CONFIG_REGISTER_DISPLAY_REFID' => "Soll die Ref-Id angezeigt werden?
(Nein = id wird editierbar!)
", )); // [EOF] diff --git a/inc/language/repair_de.php b/inc/language/repair_de.php index 3ce8e6397c..315438bba4 100644 --- a/inc/language/repair_de.php +++ b/inc/language/repair_de.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { // Language definitions addMessages(array( - 'ADMIN_REPAIR_CATS_NOTHING' => "Keine Kategorien gefunden! Vermutlich sind keine Mitglieder registriert?", + 'ADMIN_REPAIR_CATEGORIES_NOTHING' => "Keine Kategorien gefunden! Vermutlich sind keine Mitglieder registriert?", 'ADMIN_REPAIR_ENTRIES_FIXED' => "Es wurden %s Einträge repariert.", 'ADMIN_REPAIR_NOTHING_FIXED' => "Es wurden keine Einträge repariert.", 'ADMIN_REPAIR_LANGUAGE_TO_MUCH' => "Es sind mehr als 100 nicht existierende Elemente in der Zielsprachdatei gefunden worden.", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 485566a57f..86550891a4 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -201,24 +201,24 @@ addMessages(array( 'ADMIN_LIST_SPONSOR_ORDERS' => "Bestellungen bearbeiten", // Subject lines - 'SPONSOR_UNLOCKED_SUBJ' => "HINWEIS: Freischaltung Ihres Sponsorenaccounts", - 'ADMIN_SPONSOR_ADD_POINTS_SUBJ' => "HINWEIS: Gutschrift durch den Admin.", - 'ADMIN_SPONSOR_SUB_POINTS_SUBJ' => "HINWEIS: Abzug durch den Admin.", - 'SPONSOR_SUBJECT_LOCKED' => "HINWEIS: Sperrung Ihres Sponsorenaccounts.", - 'SPONSOR_SUBJECT_UNLOCKED' => "HINWEIS: Freigabe Ihres Sponsorenaccounts.", + 'SPONSOR_UNLOCKED_SUBJECT' => "HINWEIS: Freischaltung Ihres Sponsorenaccounts", + 'ADMIN_SPONSOR_ADD_POINTS_SUBJECT' => "HINWEIS: Gutschrift durch den Admin.", + 'ADMIN_SPONSOR_SUB_POINTS_SUBJECT' => "HINWEIS: Abzug durch den Admin.", + 'SPONSOR_LOCKED_SUBJECT' => "HINWEIS: Sperrung Ihres Sponsorenaccounts.", + 'SPONSOR_UNLOCKED_SUBJECT' => "HINWEIS: Freigabe Ihres Sponsorenaccounts.", 'ADMIN_SPONSOR_EDIT_SUBJECT' => "HINWEIS: Sponsorenaccount geändert durch Admin.", 'ADMIN_SPONSOR_DEL_SUBJECT' => "HINWEIS: Sponsorenaccount geloescht durch Admin.", - 'SPONSOR_PLEASE_CONFIRM_SUBJ' => "HINWEIS: Bitte bestätigen Sie Ihren Account.", - 'SPONSOR_ACCOUNT_PENDING_SUBJ' => "HINWEIS: Ihr Account wartet auf Freischaltung.", + 'SPONSOR_PLEASE_CONFIRM_SUBJECT' => "HINWEIS: Bitte bestätigen Sie Ihren Account.", + 'SPONSOR_ACCOUNT_PENDING_SUBJECT' => "HINWEIS: Ihr Account wartet auf Freischaltung.", 'ADMIN_NEW_SPONSOR' => "Neue Anmeldung eines Sponsors", - 'SPONSOR_ACTIVATION_LINK_SUBJ' => "HINWEIS: Erneute Aussendung Ihres Bestätigunglinkes.", - 'SPONSOR_LOST_PASSWORD_SUBJ' => "HINWEIS: Ihr neues Passwort", - 'SPONSOR_ACC_DATA_SUBJ' => "HINWEIS: Änderung Ihrer Daten", - 'SPONSOR_ACC_EMAIL_SUBJ' => "HINWEIS: Bitte neue EMail-Adresse bestätigen.", - 'ADMIN_SPONSOR_ACC_EMAIL_SUBJ' => "Sponsor hat seine EMail-Adresse geändert.", - 'ADMIN_SPONSOR_ACC_DATA_SUBJ' => "Sponsor hat seine Daten geändert.", - 'ADMIN_SPONSOR_SETTINGS_SUBJ' => "Sponsor hat seine Einstellungen geändert.", - 'SPONSOR_SETTINGS_SUBJ' => "HINWEIS: Änderung Ihrer Einstellungen", + 'SPONSOR_ACTIVATION_LINK_SUBJECT' => "HINWEIS: Erneute Aussendung Ihres Bestätigunglinkes.", + 'SPONSOR_LOST_PASSWORD_SUBJECT' => "HINWEIS: Ihr neues Passwort", + 'SPONSOR_ACC_DATA_SUBJECT' => "HINWEIS: Änderung Ihrer Daten", + 'SPONSOR_ACC_EMAIL_SUBJECT' => "HINWEIS: Bitte neue EMail-Adresse bestätigen.", + 'ADMIN_SPONSOR_ACC_EMAIL_SUBJECT' => "Sponsor hat seine EMail-Adresse geändert.", + 'ADMIN_SPONSOR_ACC_DATA_SUBJECT' => "Sponsor hat seine Daten geändert.", + 'ADMIN_SPONSOR_SETTINGS_SUBJECT' => "Sponsor hat seine Einstellungen geändert.", + 'SPONSOR_SETTINGS_SUBJECT' => "HINWEIS: Änderung Ihrer Einstellungen", // Sponsor registration errors 'SPONSOR_SURNAME_IS_EMPTY' => "Sie haben keinen Vornamen eingegeben.", diff --git a/inc/language/support_de.php b/inc/language/support_de.php index e355a627ba..f12d609db2 100644 --- a/inc/language/support_de.php +++ b/inc/language/support_de.php @@ -44,12 +44,12 @@ if (!defined('__SECURITY')) { // Language constans addMessages(array( - 'SUPPORT_SUBJ_ADMIN_ORDER' => "[Support:] Mailbuchung", - 'SUPPORT_SUBJ_ADMIN_REFLINK' => "[Support:] Referal-Link", - 'SUPPORT_SUBJ_ADMIN_UNCONFIRMED' => "[Support:] Unbestätigte Mails", - 'SUPPORT_SUBJ_MEMBER_ORDER' => "Ihr Anfrage an den Support: Mailbuchung", - 'SUPPORT_SUBJ_MEMBER_REFLINK' => "Ihr Anfrage an den Support: Referal-Link", - 'SUPPORT_SUBJ_MEMBER_UNCONFIRMED' => "Ihr Anfrage an den Support: Unbestätigte Mails", + 'ADMIN_SUPPORT_ORDER_SUBJECT' => "[Support:] Mailbuchung", + 'ADMIN_SUPPORT_REFLINK_SUBJECT' => "[Support:] Referal-Link", + 'ADMIN_SUPPORT_UNCONFIRMED_SUBJECT' => "[Support:] Unbestätigte Mails", + 'SUPPORT_MEMBER_ORDER_SUBJECT' => "Ihr Anfrage an den Support: Mailbuchung", + 'SUPPORT_MEMBER_REFLINK_SUBJECT' => "Ihr Anfrage an den Support: Referal-Link", + 'SUPPORT_MEMBER_UNCONFIRMED_SUBJECT' => "Ihr Anfrage an den Support: Unbestätigte Mails", 'ADMIN_TASK_IS_SUPPORT_MEMBER' => "Mitglieder-Support", 'ADMIN_UNKNOWN_SUPPORT_MODE' => "Unbekannter Support-Modus %s erkannt.", 'ADMIN_TASK_SUPPORT_MODE' => "Support-Art", diff --git a/inc/language/top10_de.php b/inc/language/top10_de.php index 2cf5c7470d..7d3b6a6998 100644 --- a/inc/language/top10_de.php +++ b/inc/language/top10_de.php @@ -44,8 +44,8 @@ if (!defined('__SECURITY')) { // Language definitions addMessages(array( - 'TOP10_ADMIN_CONFIG_HEADER' => "Einstellungen an TOP-Listen", - 'TOP10_ADMIN_MAX_TOP10' => "Maximale Plätze pro Liste", + 'ADMIN_TOP10_CONFIG_HEADER' => "Einstellungen an TOP-Listen", + 'ADMIN_TOP10_MAX_TOP10' => "Maximale Plätze pro Liste", )); // [EOF] diff --git a/inc/language/transfer_de.php b/inc/language/transfer_de.php index 1afb7c8afa..a8841ef956 100644 --- a/inc/language/transfer_de.php +++ b/inc/language/transfer_de.php @@ -75,8 +75,8 @@ addMessages(array( 'TRANSFER_INVALID_RECIPIENT' => "Bitte wählen Sie einen Empfänger aus.", 'TRANSFER_INVALID_DATA' => "Konnte Absender- und Empfängerdaten nicht verifizieren.", 'TRANSFER_ADMIN_SUBJECT' => "{?POINTS?}-Transfer abgeschlossen", - 'TRANSFER_MEMBER_RECIPIENT_SUBJ' => "{?POINTS?}-Überweisung durch Mitglied", - 'TRANSFER_MEMBER_SENDER_SUBJ' => "{?POINTS?}-Überweisung an Mitglied", + 'TRANSFER_MEMBER_RECIPIENT_SUBJECT' => "{?POINTS?}-Überweisung durch Mitglied", + 'TRANSFER_MEMBER_SENDER_SUBJECT' => "{?POINTS?}-Überweisung an Mitglied", 'TRANSFER_ADMIN_AUTOPURGE' => "Auto-Loeschung von Transfer-Eintraegen", 'TRANSFER_COMPLETED' => "Überweisung vollständig.", 'TRANSFER_CONTINUE_OVERVIEW' => "Weiter zur Übersichtsseite...", diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index d89df55f30..a24098887d 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -274,7 +274,7 @@ function purgeExpiredTurboBonus() { if (SQL_AFFECTEDROWS() > 0) { // Send out email to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TURBO_SUBJECT'), 'admin_autopurge_turbo', SQL_AFFECTEDROWS()); + sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_autopurge_turbo', SQL_AFFECTEDROWS()); } // END - if } diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index 8a455f6ea0..e24a3eaac3 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.php @@ -93,9 +93,13 @@ LIMIT %s", // Rewrite userid/refid only if admin is in // @TODO Can't this be moved into EL? if (isAdmin()) { + // Set empty userid/refid + $content['userid'] = '---'; + $content['refid'] = '---'; + // Set links to admin area - if (isValidUserId($content['userid'])) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; } - if (isValidUserId($content['refid'])) { $content['refid'] = generateUserProfileLink($content['refid']); } else { $content['refid'] = '---'; } + if (isValidUserId($content['userid'])) $content['userid'] = generateUserProfileLink($content['userid']); + if (isValidUserId($content['refid'])) $content['refid'] = generateUserProfileLink($content['refid']); } // END - if // Prepare data for the row template diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php index 54064d8b19..ce20531437 100644 --- a/inc/libs/holiday_functions.php +++ b/inc/libs/holiday_functions.php @@ -85,14 +85,14 @@ LIMIT 1", // Send mail to user $message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']); - sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJ--}', $message); + sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJECT--}', $message); // Remember userid for admin $admin .= $content['userid']."\n"; } // END - if // Send mail to admins - sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin); + sendAdminNotification('{--ADMIN_HOLIDAY_UNLOCK_SUBJECT--}', 'admin_holiday_unlock', $admin); // Run all SQLs runFilterChain('run_sqls'); diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index 0950f82ccf..1a1247eb83 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -711,9 +711,6 @@ function doAdminNetworkProcessHandlenetworktypeForm () { // Add row template for deleting $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData); } elseif (isFormSent('del')) { - // Fix empty banner URL - if (trim($networkTypeData['network_type_banner_url']) == '') $networkTypeData['network_type_banner_url'] = '---'; - // Add row template for deleting $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData); } else { @@ -787,9 +784,6 @@ function doAdminNetworkProcessHandlerequestparamsForm () { // Add row template for deleting $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData); } elseif (isFormSent('del')) { - // Fix empty banner URL - if (trim($networkRequestData['request_param_default']) == '') $networkRequestData['request_param_default'] = '---'; - // Get type data $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']); diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 3ff1059c5a..1e1139e3a9 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -313,9 +313,6 @@ LIMIT 1", $OUT = ''; $SW = 2; for ($idx = '0'; $idx < $prices; $idx++) { - if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---'; - if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---'; - // Prepare marking of default (maybe current user's) id $start = ''; $end = ''; if (($DATA['userid'][$idx] == $default) && ($default > 0)) { @@ -331,7 +328,7 @@ LIMIT 1", 'end' => $end, 'userid' => $DATA['userid'][$idx], 'ref' => $DATA['ref'][$idx], - 'info' => '' + 'infos' => '' ); // Load row template and switch color @@ -530,7 +527,7 @@ function markReferalRallyesAsExpired ($result) { // Load template $message = loadEmailTemplate($template, $DATA, $userid); - sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJ', $DATA['level']), $message); + sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJECT', $DATA['level']), $message); } // END - if // Count userid @@ -549,7 +546,7 @@ function markReferalRallyesAsExpired ($result) { } // Send mail to admin - sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJ', $title), $templ, $cnt); + sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJECT', $title), $templ, $cnt); // Add task (we ignore the task id here) createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED'); @@ -694,9 +691,7 @@ LIMIT 1", // We only need to check one element in $users, see above while() block if (isset($users['userid'][$k])) { $prices['userid'][$k] = $users['userid'][$k]; - if (empty($prices['userid'][$k])) $prices['userid'][$k] = '---'; - $prices['ref'][$k] = $users['ref'][$k]; - if (empty($prices['ref'][$k])) $prices['ref'][$k] = '---'; + $prices['ref'][$k] = $users['ref'][$k]; $prices['cpoints'][$k] = $users['cpoints'][$k]; } // END - if } // END - foreach @@ -724,8 +719,7 @@ function addReferalRallyeWinners ($rallye, $default=0) { // active = 0: account is deleted or locked $active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'"); - if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---'; - if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ("".round($DATA['cpoints'][$idx])."" == '0') || (empty($DATA['cpoints'][$idx]))) { + if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ('' . round($DATA['cpoints'][$idx]) . '' == '0') || (empty($DATA['cpoints'][$idx]))) { // Allow valid and active users with at least one ref to get points $DATA['ref'][$idx] = '---'; $DATA['userid'][$idx] = '---'; @@ -798,7 +792,7 @@ WHERE $content['now_time'] = generateDateTime(time(), 1); // Send mail to admin - sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJ', $content['title']), 'admin_rallye_purged', $content); + sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJECT', $content['title']), 'admin_rallye_purged', $content); // Purge whole rallye addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1", diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php index 9305e2de50..bc50b0a209 100644 --- a/inc/libs/refback_functions.php +++ b/inc/libs/refback_functions.php @@ -406,7 +406,7 @@ function updateMemberRefbackPercents ($id, $percents) { sendEmail($dummy['refid'], '{--MEMBER_REFBACK_SUBJECT--}', $mail); // Send admin notification - sendAdminNotification(getMessage('ADMIN_REFBACK_SUBJECT'), 'admin_refback', $dummy, getMemberId()); + sendAdminNotification('{--ADMIN_REFBACK_SUBJECT--}', 'admin_refback', $dummy, getMemberId()); // All fine! $status['ok'] = true; diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 4da3b60270..46bca1b363 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -466,11 +466,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF // Send mail to user (confirmation link!) $email = $content['email']; - sendEmail($content['email'], '{--GUEST_SUBJECT_CONFIRM_LINK--}', $messageGuest); + sendEmail($content['email'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest); $content['email'] = $email; // Send mail to admin - sendAdminNotification(getMessage('ADMIN_SUBJECT_NEW_ACCOUNT'), 'register-admin', $content, $userid); + sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'register-admin', $content, $userid); } // [EOF] diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 80d000c93f..10393757c2 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -444,11 +444,11 @@ function saveSponsorData ($postData, $content) { if ($EMAIL === true) { $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}'; $templ = 'admin_sponsor_change_email'; - $subj = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJ--}'; + $subj = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}'; } else { $message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}'; $templ = 'admin_sponsor_change_data'; - $subj = '{--ADMIN_SPONSOR_ACC_DATA_SUBJ--}'; + $subj = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}'; } break; @@ -456,7 +456,7 @@ function saveSponsorData ($postData, $content) { // Set message template and subject for admin $message = '{--SPONSOR_SETTINGS_SAVED--}'; $templ = 'admin_sponsor_settings'; - $subj = '{--ADMIN_SPONSOR_SETTINGS_SUBJ--}'; + $subj = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}'; break; default: // Unknown sponsor what value! @@ -491,7 +491,7 @@ function saveSponsorData ($postData, $content) { switch (getWhat()) { case 'account': // Change account data $email_msg = loadEmailTemplate('sponsor_change_data', $content); - sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJ--}', $email_msg); + sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg); if ($EMAIL === true) { // Add hash code to content array @@ -499,14 +499,14 @@ function saveSponsorData ($postData, $content) { // Second mail goes to the new address $email_msg = loadEmailTemplate('sponsor_change_email', $content); - sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJ--}', $email_msg); + sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJECT--}', $email_msg); } // END - if break; case 'settings': // Change settings // Send email $email_msg = loadEmailTemplate('sponsor_settings', $content); - sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJ--}', $email_msg); + sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJECT--}', $email_msg); break; } // END - switch } // END - if diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 71973d37ea..3939b0e407 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -366,12 +366,6 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { // Translate some data if present $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content); - // Is the lock reason empty? - if (empty($urlData['url_lock_reason'])) { - // Fix it to three dashes - $urlData['url_lock_reason'] = '---'; - } // END - if - // Include fields only for action 'edit' if ($action == 'edit') { // Default is not limited diff --git a/inc/libs/transfer_functions.php b/inc/libs/transfer_functions.php index 6c509f4d8d..ee6946ae32 100644 --- a/inc/libs/transfer_functions.php +++ b/inc/libs/transfer_functions.php @@ -78,7 +78,7 @@ function autoPurgeTransfers ($max, $age) { // Only send email to admin(s) when we have removed entries if ($removed > 0) { - sendAdminNotification(getMessage('TRANSFER_ADMIN_AUTOPURGE'), 'admin_transfer_ap', $removed); + sendAdminNotification('{--TRANSFER_ADMIN_AUTOPURGE--}', 'admin_transfer_ap', $removed); } // END - if } diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 2c3a85df5b..05c11107ac 100644 --- a/inc/libs/wernis_functions.php +++ b/inc/libs/wernis_functions.php @@ -313,7 +313,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) { } // Translate the status IN/OUT -function WERNIS_TRANSFER_STATUS ($status) { +function translateWernisTransferStatus ($status) { // Default status $return = getMaskedMessage('WERNIS_STATUS_UNKNWOWN', $status); switch ($status) { diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index ed8d5e956d..891d19cfec 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -1133,7 +1133,7 @@ function sendAdminPasswordResetLink ($email) { $mailText = loadEmailTemplate('admin_reset_password', $content); // Send it out - sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJ--}', $mailText); + sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText); // Prepare output return getMessage('ADMIN_RESET_LINK_SENT'); diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 022b93b7f1..d543264dfd 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -430,7 +430,7 @@ LIMIT 1", $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_tasks)) { // Init infos - $content['infos'] = '---'; + $content['infos'] = ''; // Generate assign link $content['assigned_admin'] = generateAdminLink($content['assigned_admin']); diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index 7d0921b664..003f955a47 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -74,7 +74,7 @@ if (getRequestParameter('userid') == 'all') { // Load email template and send email away $message = loadEmailTemplate('add-points', $content, bigintval($content['userid'])); - sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJ--}', $message); + sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJECT--}', $message); } // END - while // Free memory @@ -105,7 +105,7 @@ if (getRequestParameter('userid') == 'all') { // Message laden $message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid'))); - sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJ--}', $message); + sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJECT--}', $message); loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}'); } else { // Prepare content diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php index 360ec7b2e5..552a7b84f0 100644 --- a/inc/modules/admin/what-config_admins.php +++ b/inc/modules/admin/what-config_admins.php @@ -109,30 +109,16 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) { $OUT = ''; $SW = 2; foreach (postRequestParameter('sel') as $id => $selected) { // Load data for the id - $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); - list($admin, $action, $what, $mode) = SQL_FETCHROW($result); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - // Prepare variables - if (empty($action)) $action = '---'; - if (empty($what)) $what = '---'; - // Get admin mode - $mode = '{--ADMINS_' . strtoupper($mode) . '_MODE--}'; + $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}'; - // Generate link - $admin = generateAdminLink($admin); - - // Prepare data for the row template - $content = array( - 'sw' => $SW, - 'id' => $id, - 'admin' => $admin, - 'action' => $action, - 'what' => $what, - 'mode' => $mode, - ); + // Add color switch + $content['sw'] = $SW; // Load row template and switch colors $OUT .= loadTemplate('admin_config_admins_del_row', true, $content); @@ -217,22 +203,11 @@ VALUES ('%s','%s','%s','%s')", // List ACLs $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_acls)) { - // Prepare variables - if (empty($content['action_menu'])) $content['action_menu'] = '---'; - if (empty($content['what_menu'])) $content['what_menu'] = '---'; - - // Get mode + // Generate mode string $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}'; - // Prepare data for the row template - $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'admin' => generateAdminLink($content['admin_id']), - 'action' => $content['action_menu'], - 'what' => $content['what_menu'], - 'mode' => $content['access_mode'], - ); + // Add color switch + $content['sw'] = $SW; // Load row template and switch colors $OUT .= loadTemplate('admin_config_admins_row', true, $content); diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php index 1383d4e54a..f72905d1bc 100644 --- a/inc/modules/admin/what-config_email.php +++ b/inc/modules/admin/what-config_email.php @@ -56,10 +56,10 @@ if (isPostRequestParameterSet(('add_max'))) { // Add this value (including comment) SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (value, comment) VALUES ('%s','%s')", array(bigintval(postRequestParameter('max')), postRequestParameter('comment')),__FILE__, __LINE__); - $content = '{--MAX_VALUE_SAVED--}'; + $content = '{--ADMIN_MAX_VALUE_SAVED--}'; } else { // Value does alread exists! - $content = '{--MAX_VALUE_ALREADY--}'; + $content = '{--ADMIN_MAX_VALUE_ALREADY--}'; } // Free memory @@ -103,18 +103,13 @@ if (isPostRequestParameterSet(('add_max'))) { $OUT = ''; $SW = 2; foreach (postRequestParameter('sel') as $id => $value) { // Load data - $result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - list($value, $comment) = SQL_FETCHROW($result); + $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - // Prepare data for the row template - $content = array( - 'sw' => $SW, - 'id' => $id, - 'value' => $value, - 'comment' => $comment, - ); + // Add color switch + $content['sw'] = $SW; // Load row template and switch color $OUT .= loadTemplate('admin_config_email_del_row', true, $content); @@ -129,18 +124,13 @@ if (isPostRequestParameterSet(('add_max'))) { $OUT = ''; $SW = 2; foreach (postRequestParameter('sel') as $id => $value) { // Load data - $result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - list($value, $comment) = SQL_FETCHROW($result); + $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - // Prepare data for the row template - $content = array( - 'sw' => $SW, - 'id' => $id, - 'value' => $value, - 'comment' => $comment, - ); + // Add color switch + $content['sw'] = $SW; // Load row template and switch color $OUT .= loadTemplate('admin_config_email_edit_row', true, $content); diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php index b4a0a3d234..f5e8f3c949 100644 --- a/inc/modules/admin/what-config_mods.php +++ b/inc/modules/admin/what-config_mods.php @@ -84,7 +84,7 @@ if (isFormSent('edit')) { loadTemplate('admin_mods_edit', false, $OUT); } else { // Nothing selected - loadTemplate('admin_settings_saved', false, '{--MODS_NOTHING_SELECTED--}'); + loadTemplate('admin_settings_saved', false, '{--ADMIN_MODS_NOTHING_SELECTED--}'); // Remove maybe confusing data unsetPostRequestParameter('edit'); @@ -120,7 +120,7 @@ if (isFormSent('edit')) { } // END - if // Entries updated - loadTemplate('admin_settings_saved', false, '{--MODS_CHANGED--}'); + loadTemplate('admin_settings_saved', false, '{--ADMIN_MODS_CHANGED--}'); } if (countPostSelection() == 0) { @@ -135,7 +135,6 @@ ORDER BY $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Reset title to --- if it is NULL - if (empty($content['title'])) $content['title'] = '---'; if (($content['module'] == 'index') || ($content['module'] == 'login')) { // Add link to detail statistics $content['module'] = '' . $content['module'] . ''; diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php index 617b0349be..c63c04e3b3 100644 --- a/inc/modules/admin/what-config_rallye_prices.php +++ b/inc/modules/admin/what-config_rallye_prices.php @@ -126,25 +126,21 @@ LIMIT 1", $OUT = ''; $SW = 2; foreach (postRequestParameter('sel') as $id => $sel) { // Load data to selected rallye - $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `rallye_id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); - list($rallye, $level, $points, $infos) = SQL_FETCHROW($result); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - // Prepare data for the row template - $content = array( - 'sw' => $SW, - 'id' => $id, - 'rallyes' => generateOptionList('rallye_data', 'id', 'title', $rallye), - 'level' => $level, - 'points' => $points, - 'infos' => $infos, - ); + // Add more content + $content['sw'] = $SW; + $content['rallye_content'] = generateOptionList('rallye_data', 'id', 'title', $content['rallye_id']); // Load row template and switch color $OUT .= loadTemplate('admin_config_rallye_edit_row', true, $content); $SW = 3 - $SW; } // END - foreach + + // Remember row content $content['rows'] = $OUT; // Prepare data for the main template @@ -166,19 +162,11 @@ LIMIT 1", // Load data to selected rallye $result = SQL_QUERY_ESC("SELECT `rallye_id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); - list($rallye, $level, $points, $infos) = SQL_FETCHROW($result); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - if (empty($infos)) $infos = '---'; - - // Prepare data for the row template - $content = array( - 'sw' => $SW, - 'id' => $id, - 'level' => $level, - 'points' => $points, - 'infos' => $infos, - ); + // Add color switch + $content['sw'] = $SW; // Load row template and switch color $OUT .= loadTemplate('admin_config_rallye_del_row', true, $content); @@ -205,18 +193,8 @@ LIMIT 1", // Load all prices for the selected rallye $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { - // Fix empty info - if (empty($content['info'])) $content['info'] = '---'; - - // Prepare data for the row template - // @TODO Rewritings: level->price_level, infos->info in template - $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'level' => $content['price_level'], - 'points' => $content['points'], - 'infos' => $content['info'], - ); + // Add color switch + $content['sw'] = $SW; // Load row template and switch color $OUT .= loadTemplate('admin_config_rallye_prices_row', true, $content); diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php index f5218da010..c684f07bc3 100644 --- a/inc/modules/admin/what-config_rewrite.php +++ b/inc/modules/admin/what-config_rewrite.php @@ -64,12 +64,9 @@ if (isFormSent()) { adminSaveSettingsFromPostData(); } else { // Load existing modules and generate TR rows for the template - $result = SQL_QUERY("SELECT module, title FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY module", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT `module`, `title` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY module", __FILE__, __LINE__); $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { - // Set title to three dashes when no title is supplied - if (empty($content['title'])) $content['title'] = '---'; - // Already registered module? if (isInString($content['module'], getConfig('rewrite_skip'))) { // Found diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php index 6361bd3fa2..66004b2f8e 100644 --- a/inc/modules/admin/what-del_holiday.php +++ b/inc/modules/admin/what-del_holiday.php @@ -87,14 +87,14 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); // Send email to user $message = loadEmailTemplate('member_holiday_removed', $content, $userid); - sendEmail($userid, '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message); + sendEmail($userid, '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message); $cnt++; } } - loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt)); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_HOLIDAY_MULTI_DEL', $cnt)); } elseif (isGetRequestParameterSet('userid')) { // Set default message - $message = '{--HOLIDAY_ADMIN_SINGLE_404--}'; + $message = '{--ADMIN_HOLIDAY_SINGLE_404--}'; // Fetch data $result_load = SQL_QUERY_ESC("SELECT @@ -118,10 +118,10 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__); // Send email to user $message = loadEmailTemplate('member_holiday_removed', $content, getRequestParameter('userid')); - sendEmail(getRequestParameter('userid'), '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message); + sendEmail(getRequestParameter('userid'), '{--ADMIN_HOLIDAY_REMOVED_SUBJECT--}', $message); // Set message - $message = '{--HOLIDAY_ADMIN_SINGLE_DELETED--}'; + $message = '{--ADMIN_HOLIDAY_SINGLE_DELETED--}'; } // END - if // Free memory diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 059fce33be..785222427f 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -101,7 +101,7 @@ LIMIT 1", // Send email $message = loadEmailTemplate('sponsor_add_points', $content); - sendEmail($content['email'], '{--ADMIN_SPONSOR_ADD_POINTS_SUBJ--}', $message); + sendEmail($content['email'], '{--ADMIN_SPONSOR_ADD_POINTS_SUBJECT--}', $message); $message = '{--ADMIN_SPONSOR_POINTS_ADDED--}'; } else { // No points entered to add! @@ -124,7 +124,7 @@ LIMIT 1", // Send email $message = loadEmailTemplate('sponsor_sub_points', $content); - sendEmail($content['email'], '{--ADMIN_SPONSOR_SUB_POINTS_SUBJ--}', $message); + sendEmail($content['email'], '{--ADMIN_SPONSOR_SUB_POINTS_SUBJECT--}', $message); $message = '{--ADMIN_SPONSOR_POINTS_SUBTRACTED--}'; } else { // No points entered to add! diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php index d581889e30..d8ba7c0667 100644 --- a/inc/modules/admin/what-list_cats.php +++ b/inc/modules/admin/what-list_cats.php @@ -53,7 +53,7 @@ if (isGetRequestParameterSet('userid')) { $content = getUserDataArray(); // Prepare constants - // @TODO No longer needed? define('__CATS_BASE' , '' . $content['surname'] . ' ' . $content['family'] . ''; diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php index d23b431eb1..414c89f6b0 100644 --- a/inc/modules/admin/what-list_holiday.php +++ b/inc/modules/admin/what-list_holiday.php @@ -61,9 +61,6 @@ if (SQL_NUMROWS($result) > 0) { // List all holiday requests $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { - // Add three dashes to comment when it is empty - if (empty($content['comments'])) $content['comments'] = '---'; - // Prepare data for the row template $content = array( 'sw' => $SW, @@ -88,7 +85,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_holiday', false, $OUT); } else { // No holiday requests found - loadTemplate('admin_settings_saved', false, '{--HOLIDAY_ADMIN_NOTHING_FOUND--}'); + loadTemplate('admin_settings_saved', false, '{--ADMIN_HOLIDAY_NOTHING_FOUND--}'); } // [EOF] diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index cd560e6dd7..bbdfcd450a 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -77,7 +77,7 @@ if (isGetRequestParameterSet('userid')) { // Prepare mail and send it away $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid'))); - sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJ--}', $message); + sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJECT--}', $message); // Display message loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}'); diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index cd00ee7295..23f72e3068 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -259,11 +259,7 @@ ORDER BY // Admins can addionally test the URL for framekillers $content['target_bank'] = '{--CLICK_HERE--}'; - } else { - // e-currency payout request - if (empty($content['target_account'])) $content['target_account'] = '---'; - if (empty($content['target_bank'])) $content['target_bank'] = '---'; - } + } // END - if // Add/Translate some data $content['sw'] = $SW; diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php index f7e11891e7..1d9c0373d4 100644 --- a/inc/modules/admin/what-list_primera.php +++ b/inc/modules/admin/what-list_primera.php @@ -65,7 +65,6 @@ if (SQL_NUMROWS($result) > 0) { $content['primera_timestamp'] = generateDateTime($content['primera_timestamp'], 2); // Fix empty message and status - if (empty($content['primera_api_message'])) $content['primera_api_message'] = '---'; if (empty($content['primera_api_status'])) $content['primera_api_status'] = 'OK'; // Append it and switch colors diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index 81cc4ae8ae..509f6d23f6 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -319,8 +319,6 @@ ORDER BY // Alter some variables if (empty($data['login'])) $data['login'] = '???'; - if (empty($data['template'])) $data['template'] = '---'; - if (empty($data['descr'])) $data['descr'] = '---'; // Transfer data into array for the template $row = array( diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 9a82dde5db..b01bb29c1f 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -47,9 +47,15 @@ addMenuDescription('admin', __FILE__); if (isGetRequestParameterSet('id')) { // Show detailed informations to a sponsor - $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count -FROM `{?_MYSQL_PREFIX?}_sponsor_data` -WHERE `id`='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT + `company`, `position`, `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`, + `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`, + `status`, `sponsor_created`, `last_online`, `last_change`, `receive_warnings`, + `points_amount`, `points_used`, `remote_addr`, `warning_interval`, `refid`, `ref_count` +FROM + `{?_MYSQL_PREFIX?}_sponsor_data` +WHERE + `id`=%s LIMIT 1", array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php index 8c7e9493fd..ed361f7886 100644 --- a/inc/modules/admin/what-list_surfbar_urls.php +++ b/inc/modules/admin/what-list_surfbar_urls.php @@ -183,7 +183,6 @@ if (SQL_NUMROWS($result) > 0) { $content['sw'] = $SW; $content['url_registered'] = generateDateTime($content['url_registered'], 2); $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); - if (empty($content['url_lock_reason'])) $content['url_lock_reason'] = '---'; // Load row template $OUT .= loadTemplate('admin_list_surfbar_urls_row', true, $content); diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index 18749aaa98..c118741a5f 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -151,7 +151,7 @@ ORDER BY $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_tasks)) { // Init infos - $content['infos'] = '---'; + $content['infos'] = ''; // Generate link $content['assigned_admin'] = generateAdminLink($content['assigned_admin']); diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 0e90bfb8d2..3697eb485f 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -123,9 +123,6 @@ LIMIT 1", if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">' . translateComma($content['refs']) . ']'; if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">' . translateComma($content['cats']) . ']'; - // Fix empty module - if (empty($content['last_module'])) $content['last_module'] = '---'; - // Calculate timestamp for birthday $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']); @@ -148,19 +145,11 @@ LIMIT 1", $content['total'] = countSumTotalData($userid, 'user_points', 'points'); $content['locked'] = countSumTotalData($userid, 'user_points', 'locked_points'); $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); - - // Is the lock reason not set? - if (!isset($content['lock_reason'])) $content['lock_reason'] = '---'; + $content['nickname'] = '{--EXT_NICKNAME_404--}'; // Nickname inclusion? // @TODO Rewrite these to filters - if (isExtensionActive('nickname')) { - // Nickname not set or invalid? Then - if ((empty($content['nickname'])) || ($content['nickname'] == $userid)) $content['nickname'] = '---'; - } else { - // Extension not found - $content['nickname'] = '{--EXT_NICKNAME_404--}'; - } + if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']); // Clickrate $content['click_rate'] = '0'; @@ -286,7 +275,8 @@ LIMIT 1", if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . ']'; // Add nickname - if ((empty($content['nickname'])) || ($content['nickname'] == $content['userid'])) $content['nickname'] = '---'; + $content['nickname'] = '{--EXT_NICKNAME_404--}'; + if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']); // Calculate total points $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points'); @@ -307,9 +297,6 @@ LIMIT 1", // If we have at least one referal, make it clickable to referal list if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">' . translateComma($content['refs']) . ']'; - // Is the lock reason not set? - if (!isset($content['lock_reason'])) $content['lock_reason'] = '---'; - // Is the extension 'country' installed? // @TODO Rewrite this into a filter if (isExtensionActive('country')) { diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php index 9d921bda87..e87ab05c0f 100644 --- a/inc/modules/admin/what-list_wernis.php +++ b/inc/modules/admin/what-list_wernis.php @@ -65,7 +65,6 @@ if (SQL_NUMROWS($result) > 0) { $content['wernis_timestamp'] = generateDateTime($content['wernis_timestamp'], 2); // Fix empty message and status - if (empty($content['wernis_api_message'])) $content['wernis_api_message'] = '---'; if (empty($content['wernis_api_status'])) $content['wernis_api_status'] = 'OK'; // Append it and switch colors diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php index a59eaf4e04..b62ee795c8 100644 --- a/inc/modules/admin/what-lock_sponsor.php +++ b/inc/modules/admin/what-lock_sponsor.php @@ -64,12 +64,12 @@ if (isGetRequestParameterSet('id')) { if ($content['status'] == 'CONFIRMED') { // Message when sponsor's account got lock $content['message'] = '{--SPONSOR_ACCOUNT_LOCKED--}'; - $subject = '{--SPONSOR_SUBJECT_LOCKED--}'; + $subject = '{--SPONSOR_LOCKED_SUBJECT--}'; $content['status'] = 'LOCKED'; } else { // Message when sponsor's account got unlock $content['message'] = '{--SPONSOR_ACCOUNT_UNLOCKED--}'; - $subject = '{--SPONSOR_SUBJECT_UNLOCKED--}'; + $subject = '{--SPONSOR_UNLOCKED_SUBJECT--}'; $content['status'] = 'CONFIRMED'; } diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 9eb4635bf8..fc2dc12221 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -71,7 +71,7 @@ if (isGetRequestParameterSet('userid')) { $message = loadEmailTemplate('lock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid'))); // Send away... - sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJ--}', $message); + sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message); } // END - if // Prepare message @@ -103,7 +103,7 @@ LIMIT 1", $message = loadEmailTemplate('unlock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid'))); // Send away... - sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJ--}', $message); + sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message); if (isExtensionActive('rallye')) { addUserToReferalRallye(getRequestParameter('userid')); } // END - if diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index 8de522a367..f61bf694f1 100644 --- a/inc/modules/admin/what-payments.php +++ b/inc/modules/admin/what-payments.php @@ -52,9 +52,9 @@ if (((!isPostRequestParameterSet(('t_wait'))) || (!isPostRequestParameterSet(('p if (isFormSent()) { switch (getRequestParameter('do')) { case 'add': - addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (time, payment, mail_title, price) VALUES ('".postRequestParameter('t_wait')."','".postRequestParameter('payment')."','".postRequestParameter('title')."','".postRequestParameter('price')."')"); - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_payments` WHERE time='%s' LIMIT 1", - array(postRequestParameter('t_wait')), __FILE__, __LINE__); + addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES ('".postRequestParameter('t_wait')."','".postRequestParameter('payment')."','".postRequestParameter('title')."','".postRequestParameter('price')."')"); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `time`='%s' LIMIT 1", + array(postRequestParameter('t_wait')), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Re-init the array here initSqls(); @@ -149,14 +149,14 @@ if (isFormSent()) { // List already existing categories for editing while ($content = SQL_FETCHARRAY($result)) { // Prepare array for the row template - // @TODO Rewritings: title->mail_title, pay->payment in template + // @TODO Rewritings: title->mail_title in template $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'time' => $content['time'], - 'title' => $content['mail_title'], - 'pay' => translateComma($content['payment']), - 'price' => translateComma($content['price']) + 'sw' => $SW, + 'id' => $content['id'], + 'time' => $content['time'], + 'title' => $content['mail_title'], + 'payment' => translateComma($content['payment']), + 'price' => translateComma($content['price']) ); // Load row template and switch colors diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php index 51e4edd397..5e99503109 100644 --- a/inc/modules/admin/what-repair_cats.php +++ b/inc/modules/admin/what-repair_cats.php @@ -71,7 +71,7 @@ if (SQL_NUMROWS($result) > 0) { } } else { // No category selections found, no members registered? - $content = '
{--ADMIN_REPAIR_CATS_NOTHING--}
'; + $content = '
{--ADMIN_REPAIR_CATEGORIES_NOTHING--}
'; } // Load template diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php index 3520e30163..a2e5a68596 100644 --- a/inc/modules/admin/what-stats_mods.php +++ b/inc/modules/admin/what-stats_mods.php @@ -75,8 +75,6 @@ if ((getRequestParameter('mod') == 'index') || (getRequestParameter('mod') == 'l $result = SQL_QUERY("SELECT `module`, `title`, `clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC, `module` ASC", __FILE__, __LINE__); $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { - if (empty($content['title'])) $content['title'] = '---'; - if (($content['module'] == 'index') || ($content['module'] == 'login')) { // Add link to detail statistics $content['module'] = '' . $content['module'] . ''; diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index 06074f5df0..970de4c9a2 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -67,7 +67,7 @@ if (getRequestParameter('userid') == 'all') { // Load message and send it away $message = loadEmailTemplate('sub-points', $content, bigintval($content['userid'])); - sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message); + sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message); } // END - while // Free memory @@ -95,7 +95,7 @@ if (getRequestParameter('userid') == 'all') { // Load email and send it away $message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid'))); - sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message); + sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message); // Output message loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_SUBTRACTED--}'); diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index a86a7f890f..5ae058b814 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -165,7 +165,7 @@ LIMIT 1", if ($REFERAL['receive_warnings'] == 'Y') { // Send notification to referal $REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL); - sendEmail($REFERAL['email'], '{--SPONSOR_REF_NOTIFY_SUBJ--}', $REF_MSG); + sendEmail($REFERAL['email'], '{--SPONSOR_REF_NOTIFY_SUBJECT--}', $REF_MSG); } // END - if // Free memory @@ -178,7 +178,7 @@ LIMIT 1", // So let's send the email away $message = loadEmailTemplate('sponsor_unlocked', $content); - sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJ--}', $message); + sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJECT--}', $message); } // END - foreach } else { // Nothing selected diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php index a19cb85f15..cda7d8e4d7 100644 --- a/inc/modules/admin/what-usr_online.php +++ b/inc/modules/admin/what-usr_online.php @@ -63,10 +63,6 @@ if (isExtensionActive('online')) { // List all online users $OUT = ''; $SW = 2; while ($row = SQL_FETCHARRAY($result)) { - // Fix empty action/what - if (empty($row['action'])) $row['action'] = '---'; - if (empty($row['what'])) $row['what'] = '---'; - if ($row['is_admin'] == 'Y') { // Is an administrator $row['userid'] = '{--_IS_ADMIN--}'; diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php index 2c3025c6ca..fcbbddb482 100644 --- a/inc/modules/guest/what-confirm.php +++ b/inc/modules/guest/what-confirm.php @@ -169,7 +169,7 @@ LIMIT 1", $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']); // Send email - sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJ--}', $message); + sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message); // And set message $content['message'] = '{--CONFIRM_LINK_SENT--}'; diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index e4fb6d12e0..340e211f52 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -97,10 +97,10 @@ LIMIT 1", if (SQL_AFFECTEDROWS() == 1) { // Prepare mail and send it to the sponsor $message = loadEmailTemplate('sponsor_pending', $data); - sendEmail($data['email'], '{--SPONSOR_ACCOUNT_PENDING_SUBJ--}', $message); + sendEmail($data['email'], '{--SPONSOR_ACCOUNT_PENDING_SUBJECT--}', $message); // Send email to admin - sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $data); + sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_pending', $data); // Sponsor account set to pending loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_IS_PENDING--}'); @@ -170,7 +170,7 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1", // Confirmed email address $message_sponsor = loadEmailTemplate('sponsor_email', $data); } - sendEmail(postRequestParameter('email'), '{--SPONSOR_ACTIVATION_LINK_SUBJ--}', $message_sponsor); + sendEmail(postRequestParameter('email'), '{--SPONSOR_ACTIVATION_LINK_SUBJECT--}', $message_sponsor); // Output message loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_SENT--}'); @@ -213,7 +213,7 @@ WHERE `email`='%s' AND `id`='%s' AND `status`='CONFIRMED' LIMIT 1", // Prepare email and send it to the sponsor $message_sponsor = loadEmailTemplate('sponsor_lost', $DATA); - sendEmail(postRequestParameter('email'), '{--SPONSOR_LOST_PASSWORD_SUBJ--}', $message_sponsor); + sendEmail(postRequestParameter('email'), '{--SPONSOR_LOST_PASSWORD_SUBJECT--}', $message_sponsor); // Update password SQL_QUERY_ESC("UPDATE diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index d3adcafea5..e9f973a31c 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -247,10 +247,10 @@ WHERE `id`='%s' LIMIT 1", // Generate email and send it to the new sponsor $message = loadEmailTemplate('sponsor_confirm', $hash); - sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJ--}', $message); + sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message); // Send mail to admin - sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_reg', $hash); + sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_reg', $hash); // Output message: DONE $message = $messageArray['added']; diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php index 44193f3aff..de8eef86e4 100644 --- a/inc/modules/guest/what-top10.php +++ b/inc/modules/guest/what-top10.php @@ -68,7 +68,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__); $OUT = ''; $SW = 2; $cnt = 1; while ($content = SQL_FETCHARRAY($result)) { // Init nickname - $content['nickname'] = '---'; + $content['nickname'] = ''; // Get nickname if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']); @@ -136,7 +136,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__); $OUT = ''; $SW = 2; $cnt = 1; while ($content = SQL_FETCHARRAY($result)) { // Init nickname - $content['nickname'] = '---'; + $content['nickname'] = ''; // Get nickname if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']); @@ -203,7 +203,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__); $OUT = ''; $SW = 2; $cnt = 1; while ($content = SQL_FETCHARRAY($result)) { // Init nickname - $content['nickname'] = '---'; + $content['nickname'] = ''; // Get nickname if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']); diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php index cb0453d670..4890aa6440 100644 --- a/inc/modules/member/what-categories.php +++ b/inc/modules/member/what-categories.php @@ -108,10 +108,10 @@ if ($cats > 0) { // Categories saved? if ($cnt > 0) { // Output message - loadTemplate('admin_settings_saved', false, '{--MEMBER_CATS_SAVED--}'); + loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_SAVED--}'); } else { // None save - loadTemplate('admin_settings_saved', false, '{--MEMBER_CATS_NOT_SAVED--}'); + loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_NOT_SAVED--}'); } } else { if ($LEAST === true) { @@ -161,7 +161,7 @@ if ($cats > 0) { } } else { // No cateogries are defined yet - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATS--}'); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}'); } // Free result diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index fc3b735786..ef2b99b8f4 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -148,10 +148,10 @@ LIMIT 1", sendEmail(getMemberId(), '{--HOLIDAY_MEMBER_SUBJECT--}', $message); // Send mail to all admins - sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getMemberId()); + sendAdminNotification('{--ADMIN_HOLIDAY_SUBJECT--}', 'admin_holiday_request', $content, getMemberId()); // Create task (we ignore the task id here) - createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId()); + createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId()); // Display message loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}'); @@ -210,7 +210,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__); // Send email to admin - sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId()); + sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId()); // Display message to user loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_DEACTIVATED_NOW--}'); diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index b6dcc84b2f..d6744299fa 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -153,7 +153,7 @@ LIMIT 1", setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200))); if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) { // URL in subject found - $url = 'modules.php?module=login&what=order&code=' . getCode('SUBJ_URL'); + $url = 'modules.php?module=login&what=order&code=' . getCode('SUBJECT_URL'); } // END - if } // END - if @@ -694,7 +694,7 @@ LIMIT 1", } } else { // No cateogries are defined yet - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATS--}'); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}'); } } elseif ($mmails == '0') { // Please set more than 0 mails per day diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index f1bf55152a..1283c94854 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -114,11 +114,7 @@ ORDER BY $content['target_account'] = $content['alt']; } $content['target_bank'] = '{--CLICK_HERE--}'; - } else { - // e-currency payout request - if (empty($content['target_account'])) $content['target_account'] = '---'; - if (empty($content['target_bank'])) $content['target_bank'] = '---'; - } + } // END - if // Prepare data for the template $content = array( @@ -151,7 +147,7 @@ ORDER BY } } else { // Chedk if he can get paid by selected type - $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `type`, `rate`, `min_points`, `allow_url` AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", array(bigintval(getRequestParameter('payout'))), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { @@ -226,13 +222,13 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", } // Generate task (we ignore the task id here) - createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJ--}', $message_adm, 'PAYOUT_REQUEST', getMemberId()); + createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $message_adm, 'PAYOUT_REQUEST', getMemberId()); // Send out mails - sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJ--}', $message_mem); + sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJECT--}', $message_mem); // To admin(s) - sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId()); + sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId()); // Load template and output it loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}'); diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index 6932b6ecd0..2017dfd902 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -128,7 +128,7 @@ $content['rows'] = $OUT; // Initialize variables $content['confirmed'] = '---'; $content['sent'] = '---'; -$content['receive'] = '---'; +$content['receive'] = '---'; // Only user >= v0.1.2: Fetch confirmed mails counter if (isExtensionInstalledAndNewer('user', '0.1.2')) { @@ -136,17 +136,10 @@ if (isExtensionInstalledAndNewer('user', '0.1.2')) { $content['confirmed'] = getUserData('mails_confirmed'); if (isExtensionInstalledAndNewer('user', '0.1.4')) { - $content['sent'] = getUserData('emails_sent'); + $content['sent'] = getUserData('emails_sent'); $content['receive'] = getUserData('emails_received'); } // END - if - - // Please update the user extension if you see 3 dashes - if (empty($content['sent'])) $content['sent'] = '---'; - if (empty($content['receive'])) $content['receive'] = '---'; -} else { - // Please update! - $content['confirmed'] = '---'; -} +} // END - if // If TLOCK is 0 add 3 zeros for floating if ($content['total_locked'] == '0') $content['total_locked'] = '0.00000'; diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index 28d898f32c..3f199c71d8 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -127,7 +127,6 @@ if (SQL_NUMROWS($result) > 0) { $refRow['sw'] = $SW; // @TODO UNUSED: $refRow['status'] = translateUserStatus($refRow['status']); $refRow['joined'] = generateDateTime($refRow['joined'], '3'); - if (empty($refRow['nickname'])) $refRow['nickname'] = '---'; // Load row template if ($deleted === true) { diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php index 7797639cb9..0740acbdef 100644 --- a/inc/modules/member/what-reflist.php +++ b/inc/modules/member/what-reflist.php @@ -49,11 +49,14 @@ if (!defined('__SECURITY')) { addMenuDescription('member', __FILE__); // Load all referal levels -$result = SQL_QUERY_ESC("SELECT r.level, r.percents -FROM `{?_MYSQL_PREFIX?}_refdepths` AS r -WHERE r.level > 0 -ORDER BY r.level ASC", -array(getMemberId()), __FILE__, __LINE__); +$result = SQL_QUERY('SELECT + `level`, `percents` +FROM + `{?_MYSQL_PREFIX?}_refdepths` +WHERE + `level` > 0 +ORDER BY + `level` ASC', __FILE__, __LINE__); // Are there some entries? (Shall be!) if (SQL_NUMROWS($result) > 0) { @@ -69,11 +72,7 @@ if (SQL_NUMROWS($result) > 0) { foreach (getUserReferalPoints(getMemberId(), $content['level']) as $refRow) { // Add/"translate" more content $refRow['sw'] = $SW; - $refRow['points'] = translateComma($refRow['points']); - $refRow['status'] = translateUserStatus($refRow['status']); - $refRow['unconfirmed'] = translateComma($refRow['unconfirmed']); $refRow['clickrate'] = translateComma($refRow['clickrate'], true, 1); - if (empty($refRow['nickname'])) $refRow['nickname'] = '---'; // Load row template $rows .= loadTemplate('member_ref_list_row', true, $refRow); @@ -84,7 +83,7 @@ if (SQL_NUMROWS($result) > 0) { } // END - foreach // Remember the content - $content['counter'] = translateComma($counter); + $content['counter'] = $counter; $content['percents'] = translateComma($content['percents'], true, 1); $content['rows'] = $rows; @@ -102,5 +101,5 @@ if (SQL_NUMROWS($result) > 0) { // Free result SQL_FREERESULT($result); -// +// [EOF] ?> diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php index a8ceb41050..8e0eec535d 100644 --- a/inc/modules/member/what-support.php +++ b/inc/modules/member/what-support.php @@ -67,18 +67,18 @@ if ((!isFormSent()) || (!isPostRequestParameterSet(('qsummary')))) { // Select right subject switch (postRequestParameter('qsummary')) { case 'ordr': - $subj_a = '{--SUPPORT_SUBJ_ADMIN_ORDER--}'; - $subj_m = '{--SUPPORT_SUBJ_MEMBER_ORDER--}'; + $subj_a = '{--ADMIN_SUPPORT_ORDER_SUBJECT--}'; + $subj_m = '{--SUPPORT_MEMBER_ORDER_SUBJECT--}'; break; case 'reflink': - $subj_a = '{--SUPPORT_SUBJ_ADMIN_REFLINK--}'; - $subj_m = '{--SUPPORT_SUBJ_MEMBER_REFLINK--}'; + $subj_a = '{--ADMIN_SUPPORT_REFLINK_SUBJECT--}'; + $subj_m = '{--SUPPORT_MEMBER_REFLINK_SUBJECT--}'; break; case 'unconfirmed': - $subj_a = '{--SUPPORT_SUBJ_ADMIN_UNCONFIRMED--}'; - $subj_m = '{--SUPPORT_SUBJ_MEMBER_UNCONFIRMED--}'; + $subj_a = '{--ADMIN_SUPPORT_UNCONFIRMED_SUBJECT--}'; + $subj_m = '{--SUPPORT_MEMBER_UNCONFIRMED_SUBJECT--}'; break; } // END - switch diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index 14a3ed991f..83210ee9d7 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -81,10 +81,6 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP $content['url_registered'] = generateDateTime($content['url_registered'], 2); $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); $content['actions'] = SURFBAR_MEMBER_ACTIONS($content['id'], $content['url_status']); - if (empty($content['url_lock_reason'])) { - // Fixes some HTML problems with empty cells - $content['url_lock_reason'] = '---'; - } // END - if // Load row template $OUT .= loadTemplate('member_surfbar_list_row', true, $content); diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index ffb4a4c809..e0d8f1fbc9 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -161,11 +161,11 @@ switch ($mode) { // First send email to recipient $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid')); - sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJ--}' . ': ' . $SENDER, $message); + sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJECT--}' . ': ' . $SENDER, $message); // Second send email to sender $message = loadEmailTemplate('member_transfer_sender', $content, getMemberId()); - sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJ--}' . ': ' . $RECIPIENT, $message); + sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJECT--}' . ': ' . $RECIPIENT, $message); // At last send admin mail(s) $adminSubject = sprintf("%s (%s->%s)", '{--TRANSFER_ADMIN_SUBJECT--}', $SENDER, $RECIPIENT); diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 1cd9e9d533..a7b77699b2 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -83,7 +83,7 @@ LIMIT 1", } elseif (isGetRequestParameterSet(('mailid'))) { // Display regular member mail by loading its full data $result_data = SQL_QUERY_ESC("SELECT - s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id AS `category`, pay.price AS points, p.sender, pay.time, p.data_type + s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type FROM `{?_MYSQL_PREFIX?}_user_stats` AS s LEFT JOIN @@ -116,7 +116,7 @@ LIMIT 1", } // END - if // Display it depending on mail (data) type - loadTemplate('member_mail_normal_'.strtolower($content['data_type']), false, $content); + loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content); // Free result SQL_FREERESULT($result_data); diff --git a/inc/modules/order.php b/inc/modules/order.php index 338a6530b6..469590e294 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -54,18 +54,18 @@ if (!defined('__SECURITY')) { // When URL is empty nothing bad happend here if (empty($url)) { + // Auto-send is inactive + $content['admin_autosend'] = '{--ADMIN_AUTOSEND_INACTIVE--}'; + $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}'; + $type = 'ADMIN'; + // Is the auto-send mechanism active or inactive? if (getConfig('autosend_active') == 'Y') { // Auto-send is active $content['admin_autosend'] = '{--ADMIN_AUTOSEND_ACTIVE--}'; $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}'; $type = 'NEW'; - } else { - // Auto-send is inactive - $content['admin_autosend'] = '{--ADMIN_AUTOSEND_INACTIVE--}'; - $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}'; - $type = 'ADMIN'; - } + } // END - if // Update sending pool SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='%s' WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1", @@ -95,16 +95,12 @@ if (empty($url)) { if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1'; subtractPoints('order', getMemberId(), $usedPoints); - // Compile content - $content['payment'] = getPaymentTitlePrice($content['payment_id']); - $content['category'] = getCategory($content['cat_id']); - // Send an email to the user $message_mem = loadEmailTemplate('order-member', $content, getMemberId()); sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem); // Notify admins about this - sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId()); + sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId()); // Create new task (we ignore the task id here) createNewTask( diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 16211103a2..3597c8a78b 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1313,7 +1313,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify $message = loadEmailTemplate('add-points', $content, $userid); // And sent it away - sendEmail($userid, '{--SUBJECT_DIRECT_PAYMENT--}', $message); + sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message); if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}'); } @@ -1875,7 +1875,7 @@ function generateCategoryOptionsList ($mode) { } // END - foreach } else { // No cateogries are defined yet - $OUT = ''; + $OUT = ''; } // Return HTML code diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php index 85388e456a..c9bee512e0 100644 --- a/inc/pool/pool-user.php +++ b/inc/pool/pool-user.php @@ -174,14 +174,14 @@ if (SQL_NUMROWS($result_main) > 0) { // Prepare content $content = array( 'sender_userid' => $DATA['sender'], - 'category' => getCategory($DATA['cat_id']), + 'cat_id' => $DATA['cat_id'], 'text' => $DATA['text'], 'url' => $DATA['url'], - 'expiration' => createFancyTime(getPaymentPoints($DATA['payment_id'], "time")) + 'expiration' => createFancyTime(getPaymentPoints($DATA['payment_id'], 'time')) ); // Yes we do, so we notify admin and sender about fully sent mail! - sendAdminNotification(getMessage('ADMIN_SUBJ_SEND_DONE'), 'done-admin', $content, $userid); + sendAdminNotification('{--ADMIN_SEND_DONE_SUBJECT--}', 'done-admin', $content, $userid); // Get sender's data if (fetchUserData($DATA['sender'])) { @@ -189,7 +189,7 @@ if (SQL_NUMROWS($result_main) > 0) { $mailText = loadEmailTemplate('done-member', $content, $DATA['sender']); // Send it also waway - sendEmail(getUserData('email'), '{--MEMBER_SUBJ_SEND_DONE--}', $mailText); + sendEmail(getUserData('email'), '{--MEMBER_SEND_DONE_SUBJECT--}', $mailText); } // END - if // Set status to SEND because we completely send it away @@ -285,7 +285,7 @@ if (SQL_NUMROWS($result_main) > 0) { addPointsToJackpot($PB); // Send mail out to admin - sendAdminNotification(getMessage('ADMIN_BACK_JACKPOT') . ' (' . $userid . ')', 'back-admin', $content, 'admin'); + sendAdminNotification('{--ADMIN_BACK_JACKPOT--}' . ' (' . $userid . ')', 'back-admin', $content, 'admin'); } } // END - if } // END - foreach diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php index bf8fffcb42..62afa6a80e 100644 --- a/inc/reset/reset_holiday.php +++ b/inc/reset/reset_holiday.php @@ -94,7 +94,7 @@ LIMIT 1", // Send email to user $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']); - sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJ--}', $message); + sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJECT--}', $message); // Update account addSql(SQL_QUERY_ESC("UPDATE diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index fdd6be73f4..df22a69ec0 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -1073,5 +1073,17 @@ function encodeEntities ($str) { return $str; } +// "Fixes" an empty string into three dashes (use for templates) +function fixEmptyContentToDashes ($str) { + // Trim the string + $str = trim($str); + + // Is the string empty? + if (empty($str)) $str = '---'; + + // Return string + return $str; +} + // [EOF] ?> diff --git a/templates/de/emails/done-admin.tpl b/templates/de/emails/done-admin.tpl index 06fe0ace3f..a5dda9ee6f 100644 --- a/templates/de/emails/done-admin.tpl +++ b/templates/de/emails/done-admin.tpl @@ -11,7 +11,7 @@ Werber: $content[sender_userid] ------------------------------ Verfallszeit: $content[expiration] ------------------------------ -Beworbene Kategorie: $content[category] +Beworbene Kategorie: {%pipe,getCategory=$content[cat_id]%} ------------------------------ Beworbene URL: $content[url] ------------------------------ diff --git a/templates/de/emails/done-member.tpl b/templates/de/emails/done-member.tpl index 4a507a5d22..98d22948c4 100644 --- a/templates/de/emails/done-member.tpl +++ b/templates/de/emails/done-member.tpl @@ -11,7 +11,7 @@ Werber: $content[sender_userid] ---------------- Verfallszeit: $content[expiration] ---------------- -Beworbene Kategorie: $content[category] +Beworbene Kategorie: {%pipe,getCategory=$content[cat_id]%} ---------------- Beworbene URL: $content[url] ---------------- diff --git a/templates/de/emails/order-admin.tpl b/templates/de/emails/order-admin.tpl index e960cc6935..e1b0827b87 100644 --- a/templates/de/emails/order-admin.tpl +++ b/templates/de/emails/order-admin.tpl @@ -10,8 +10,8 @@ Anrede: {%user,gender,translateGender=$userid%} Vorname: {%user,surname=$userid%} Nachname: {%user,family=$userid%} Email-Adresse: {%user,email=$userid%} -Gebuchte Kategorie: $content[category] -Gebuchter Payment-Typ: $content[payment] +Gebuchte Kategorie: {%pipe,getCategory=$content[cat_id]%} +Gebuchter Payment-Typ: {%pipe,getPaymentTitlePrice=$content[payment_id]%} Betreffzeile in den Mails: $content[subject] Gebuchte URL: $content[url] ------------------------------------ diff --git a/templates/de/emails/order-member.tpl b/templates/de/emails/order-member.tpl index 93980bc89e..8dbf11fb6f 100644 --- a/templates/de/emails/order-member.tpl +++ b/templates/de/emails/order-member.tpl @@ -4,8 +4,8 @@ Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesende Hier sind nochmals Ihre Daten aus dem Buchungsformular: ------------------------------------------------ -Gebuchte Kategorie: $content[category] -Gebuchter Payment-Typ: $content[payment] +Gebuchte Kategorie: {%pipe,getCategory=$content[cat_id]%} +Gebuchter Payment-Typ: {%pipe,getPaymentTitlePrice=$content[payment_id]%} Betreffzeile in den Mails: $content[subject] Gebuchte URL: $content[url] ------------------------------------------------ diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl index 3c37caa694..288d1a4190 100644 --- a/templates/de/html/admin/admin_add_max.tpl +++ b/templates/de/html/admin/admin_add_max.tpl @@ -7,16 +7,16 @@ - {--MAX_RECEIVE--} + {--ADMIN_MAX_RECEIVE--} - {--ENTER_MAX_VALUE--}: + {--ADMIN_ENTER_MAX_VALUE--}: - {--ENTER_MAX_COMMENT--}: + {--ADMIN_ENTER_MAX_COMMENT--}: @@ -24,7 +24,7 @@ - + diff --git a/templates/de/html/admin/admin_config_admins_del_row.tpl b/templates/de/html/admin/admin_config_admins_del_row.tpl index 844f8b75ba..06aaafa9f8 100644 --- a/templates/de/html/admin/admin_config_admins_del_row.tpl +++ b/templates/de/html/admin/admin_config_admins_del_row.tpl @@ -3,15 +3,15 @@ - $content[admin] + {%pipe,generateAdminLink=$content[admin_id]%} - $content[action] + {%pipe,fixEmptyContentToDashes=$content[action_menu]%} - $content[what] + {%pipe,fixEmptyContentToDashes=$content[what_menu]%} - $content[mode] + $content[access_mode] diff --git a/templates/de/html/admin/admin_config_admins_row.tpl b/templates/de/html/admin/admin_config_admins_row.tpl index 0b0b38ddf5..aa0846f501 100644 --- a/templates/de/html/admin/admin_config_admins_row.tpl +++ b/templates/de/html/admin/admin_config_admins_row.tpl @@ -3,15 +3,15 @@ - $content[admin] + {%pipe,generateAdminLink=$content[admin_id]%} - $content[action] + {%pipe,fixEmptyContentToDashes=$content[action_menu]%} - $content[what] + {%pipe,fixEmptyContentToDashes=$content[what_menu]%} - $content[mode] + $content[access_mode] diff --git a/templates/de/html/admin/admin_config_cats.tpl b/templates/de/html/admin/admin_config_cats.tpl index 1416bdd6bc..096ef444d5 100644 --- a/templates/de/html/admin/admin_config_cats.tpl +++ b/templates/de/html/admin/admin_config_cats.tpl @@ -16,8 +16,8 @@ - - + + diff --git a/templates/de/html/admin/admin_config_email.tpl b/templates/de/html/admin/admin_config_email.tpl index 16f9db205d..5b75eab74d 100644 --- a/templates/de/html/admin/admin_config_email.tpl +++ b/templates/de/html/admin/admin_config_email.tpl @@ -3,20 +3,20 @@ - - + + $content[rows]
- {--EDIT_DEL_MAX_VALUES--} + {--ADMIN_EDIT_DEL_MAX_VALUES--}
{--ID_SELECT--}{--MAX_VALUE!}{--MAX_COMMENT--}{--ADMIN_MAX_VALUE--}{--ADMIN_MAX_COMMENT--}
- - + +
diff --git a/templates/de/html/admin/admin_config_email_del_row.tpl b/templates/de/html/admin/admin_config_email_del_row.tpl index 87c0ce175e..3330987605 100644 --- a/templates/de/html/admin/admin_config_email_del_row.tpl +++ b/templates/de/html/admin/admin_config_email_del_row.tpl @@ -5,7 +5,7 @@ - $content[value] ($content[comment]) + $content[value] ({%pipe,fixEmptyContentToDashes=$content[comment]%}) diff --git a/templates/de/html/admin/admin_config_email_edit_row.tpl b/templates/de/html/admin/admin_config_email_edit_row.tpl index af555e401a..5b0843dc5f 100644 --- a/templates/de/html/admin/admin_config_email_edit_row.tpl +++ b/templates/de/html/admin/admin_config_email_edit_row.tpl @@ -5,7 +5,7 @@ - {--MREC_VALUE!}:  + {--MREC_VALUE--}:  diff --git a/templates/de/html/admin/admin_config_email_row.tpl b/templates/de/html/admin/admin_config_email_row.tpl index ca5315b792..61de8d522e 100644 --- a/templates/de/html/admin/admin_config_email_row.tpl +++ b/templates/de/html/admin/admin_config_email_row.tpl @@ -3,9 +3,9 @@ -  $content[value]  + $content[value] -  $content[comment]  + {%pipe,fixEmptyContentToDashes=$content[comment]%} diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 53e17a4ac4..6691f723f3 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -3,27 +3,27 @@ - + - + - + diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index 9a664e73b2..4c0ec8ca97 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -3,7 +3,7 @@
- {--HOLIDAY_ADMIN_CONFIG_HEADER--} + {--ADMIN_HOLIDAY_CONFIG_HEADER--}
{--HOLIDAY_ADMIN_MAX_HOLIDAY--}:{--ADMIN_HOLIDAY_MAX_HOLIDAY--}:
({--DAYS--})
{--HOLIDAY_ADMIN_LOCKED--}:{--ADMIN_HOLIDAY_LOCKED--}: $content[locked]
{--HOLIDAY_ADMIN_MODE--}:{--ADMIN_HOLIDAY_MODE--}: - {--HOLIDAY_ADMIN_MODE_RESET--}
+ {--ADMIN_HOLIDAY_MODE_RESET--}
- {--HOLIDAY_ADMIN_MODE_DIRECT--} + {--ADMIN_HOLIDAY_MODE_DIRECT--}
diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 1c851a8a43..22671b7370 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -54,7 +54,7 @@ diff --git a/templates/de/html/admin/admin_config_rallye_del_row.tpl b/templates/de/html/admin/admin_config_rallye_del_row.tpl index 6423f96fbd..c4815e28d4 100644 --- a/templates/de/html/admin/admin_config_rallye_del_row.tpl +++ b/templates/de/html/admin/admin_config_rallye_del_row.tpl @@ -1,14 +1,14 @@ diff --git a/templates/de/html/admin/admin_config_rallye_edit_row.tpl b/templates/de/html/admin/admin_config_rallye_edit_row.tpl index 889095e308..c7b75929de 100644 --- a/templates/de/html/admin/admin_config_rallye_edit_row.tpl +++ b/templates/de/html/admin/admin_config_rallye_edit_row.tpl @@ -1,16 +1,16 @@ diff --git a/templates/de/html/admin/admin_config_rallye_prices_row.tpl b/templates/de/html/admin/admin_config_rallye_prices_row.tpl index 0ac2dc9a38..94542e7fd1 100644 --- a/templates/de/html/admin/admin_config_rallye_prices_row.tpl +++ b/templates/de/html/admin/admin_config_rallye_prices_row.tpl @@ -3,12 +3,12 @@ diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index 7ad39b5de7..cbe34fda41 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -7,17 +7,17 @@ - + - + - + diff --git a/templates/de/html/admin/admin_config_rewrite_rows.tpl b/templates/de/html/admin/admin_config_rewrite_rows.tpl index dc6f8ed14d..d55eba6409 100644 --- a/templates/de/html/admin/admin_config_rewrite_rows.tpl +++ b/templates/de/html/admin/admin_config_rewrite_rows.tpl @@ -1,6 +1,6 @@ - + diff --git a/templates/de/html/admin/admin_del_network_types_row.tpl b/templates/de/html/admin/admin_del_network_types_row.tpl index 3cabf88e7f..c5f5977182 100644 --- a/templates/de/html/admin/admin_del_network_types_row.tpl +++ b/templates/de/html/admin/admin_del_network_types_row.tpl @@ -20,6 +20,6 @@ diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl index f02dc4c4aa..56c3b0bf60 100644 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ b/templates/de/html/admin/admin_edit_cats.tpl @@ -10,7 +10,7 @@ $content
- {--NICKNAME_ADMIN_CONFIG_HEADER--} + {--ADMIN_NICKNAME_CONFIG_HEADER--}
- {--ADMIN_OPTION_CHECK_EMAIL_SUBJ--} + {--ADMIN_OPTION_CHECK_EMAIL_SUBJECT--} {--YES--}
@@ -76,9 +76,9 @@ 		{--ADMIN_REPAY_ON_DELETE_MODE--}
- $content[id] + $content[rallye_id] - $content[level] + $content[price_level] -  $content[points] + {%pipe,translateComma=$content[points]%} -  $content[infos] + {%pipe,fixEmptyContentToDashes=$content[info]%}
- + $content[rallye_content] - + - + - +
- $content[level] + $content[price_level] -  $content[points] + {%pipe,translateComma=$content[points]%} -  $content[infos] + {%pipe,fixEmptyContentToDashes=$content[infos]%}
{--LEAST_CATS--}:{--LEAST_CATEGORIES--}:
{--ADMIN_CFG_REGISTER_DEFAULT--}:{--ADMIN_CONFIG_REGISTER_DEFAULT--}: $content[register_default]
{--ADMIN_CFG_REGISTER_DISPLAY_REFID--}:{--ADMIN_CONFIG_REGISTER_DISPLAY_REFID--}: $content[display_refid]
$content[module]$content[title]{%pipe,fixEmptyContentToDashes=$content[title]%} {--YES--}
{--NO--} diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl index 4cddda7725..3815a6a2e8 100644 --- a/templates/de/html/admin/admin_config_top10.tpl +++ b/templates/de/html/admin/admin_config_top10.tpl @@ -3,11 +3,11 @@ - + diff --git a/templates/de/html/admin/admin_del_cats.tpl b/templates/de/html/admin/admin_del_cats.tpl index c446fa0a2a..f81a07a58c 100644 --- a/templates/de/html/admin/admin_del_cats.tpl +++ b/templates/de/html/admin/admin_del_cats.tpl @@ -10,7 +10,7 @@
- {--TOP10_ADMIN_CONFIG_HEADER--} + {--ADMIN_TOP10_CONFIG_HEADER--}
{--TOP10_ADMIN_MAX_TOP10--}:{--ADMIN_TOP10_MAX_TOP10--}:
- +
diff --git a/templates/de/html/admin/admin_del_network_params_row.tpl b/templates/de/html/admin/admin_del_network_params_row.tpl index 04e926527f..f9a9a94acb 100644 --- a/templates/de/html/admin/admin_del_network_params_row.tpl +++ b/templates/de/html/admin/admin_del_network_params_row.tpl @@ -20,6 +20,6 @@
{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}: - $content[request_param_default] + {%pipe,fixEmptyContentToDashes=$content[request_param_default]%}
{--ADMIN_NETWORK_TYPES_BANNER_URL--}: - $content[network_type_banner_url] + {%pipe,fixEmptyContentToDashes=$content[network_type_banner_url]%}
- +
diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index 921c3a3987..d331d62df4 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -16,7 +16,7 @@ - {--EMAIL_EDIT_SUBJ--}: + {--EMAIL_EDIT_SUBJECT--}: diff --git a/templates/de/html/admin/admin_list_cats_404.tpl b/templates/de/html/admin/admin_list_cats_404.tpl index b78420dae4..d812ec86b9 100644 --- a/templates/de/html/admin/admin_list_cats_404.tpl +++ b/templates/de/html/admin/admin_list_cats_404.tpl @@ -1,7 +1,7 @@
- {--ADMIN_MEMBER_NO_CATS_1--}$content[userid]{--ADMIN_MEMBER_NO_CATS_2--} + {--ADMIN_MEMBER_NO_CATEGORIES_1--}$content[userid]{--ADMIN_MEMBER_NO_CATEGORIES_2--}
diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl index 9fa85632de..a89f6d066a 100644 --- a/templates/de/html/admin/admin_list_holiday.tpl +++ b/templates/de/html/admin/admin_list_holiday.tpl @@ -4,9 +4,9 @@ {--ID_SELECT--} {--_UID--}: - {--HOLIDAY_ADMIN_TSTART--}: - {--HOLIDAY_ADMIN_TEND--}: - {--HOLIDAY_ADMIN_COMMENTS--}: + {--ADMIN_HOLIDAY_TSTART--}: + {--ADMIN_HOLIDAY_TEND--}: + {--ADMIN_HOLIDAY_COMMENTS--}: {--ACCOUNT_STATUS--}: {--ADMIN_LAST_ONLINE--}: @@ -15,7 +15,7 @@ + value="{--ADMIN_HOLIDAY_STOP_CHECKED--}" /> diff --git a/templates/de/html/admin/admin_list_holiday_row.tpl b/templates/de/html/admin/admin_list_holiday_row.tpl index 8603de0e38..fe8a46714a 100644 --- a/templates/de/html/admin/admin_list_holiday_row.tpl +++ b/templates/de/html/admin/admin_list_holiday_row.tpl @@ -12,7 +12,9 @@ $content[end] -
$content[comments]
+
+ {%pipe,fixEmptyContentToDashes=$content[comments]%} +
{%pipe,translateUserStatus=$content[status]%} diff --git a/templates/de/html/admin/admin_list_mods.tpl b/templates/de/html/admin/admin_list_mods.tpl index fbbf94504d..8f619b654b 100644 --- a/templates/de/html/admin/admin_list_mods.tpl +++ b/templates/de/html/admin/admin_list_mods.tpl @@ -4,24 +4,24 @@ {--ID_SELECT--} - {--MODS_NAME--} - {--MODS_TITLE--} - {--MODS_IS_LOCKED--} - {--MODS_IS_HIDDEN--} - {--MODS_IS_ADMIN--} - {--MODS_IS_MEMBER--} + {--ADMIN_MODS_NAME--} + {--ADMIN_MODS_TITLE--} + {--ADMIN_MODS_IS_LOCKED--} + {--ADMIN_MODS_IS_HIDDEN--} + {--ADMIN_MODS_IS_ADMIN--} + {--ADMIN_MODS_IS_MEMBER--} $content - +
- {--MODS_ADMIN_EDIT_NOTE--} + {--ADMIN_MODS_EDIT_NOTE--}
diff --git a/templates/de/html/admin/admin_list_mods_row.tpl b/templates/de/html/admin/admin_list_mods_row.tpl index 1b6f952cee..7ef5f779a6 100644 --- a/templates/de/html/admin/admin_list_mods_row.tpl +++ b/templates/de/html/admin/admin_list_mods_row.tpl @@ -6,7 +6,7 @@ $content[module] - $content[title] + {%pipe,fixEmptyContentToDashes=$content[title]%} {%pipe,translateYesNo=$content[locked]%} diff --git a/templates/de/html/admin/admin_list_online_row.tpl b/templates/de/html/admin/admin_list_online_row.tpl index ff714862b1..faf51310d3 100644 --- a/templates/de/html/admin/admin_list_online_row.tpl +++ b/templates/de/html/admin/admin_list_online_row.tpl @@ -3,8 +3,8 @@ $content[userid] $content[ip] {%pipe,generateUserProfileLink=$content[refid]%} - $content[module] - $content[action] - $content[what] + {%pipe,fixEmptyContentToDashes=$content[module]%} + {%pipe,fixEmptyContentToDashes=$content[action]%} + {%pipe,fixEmptyContentToDashes=$content[what]%} $content[timestamp] diff --git a/templates/de/html/admin/admin_list_payouts_row.tpl b/templates/de/html/admin/admin_list_payouts_row.tpl index 141ec93eff..9fa07451c7 100644 --- a/templates/de/html/admin/admin_list_payouts_row.tpl +++ b/templates/de/html/admin/admin_list_payouts_row.tpl @@ -1,8 +1,8 @@ {%pipe,generateUserProfileLink=$content[userid]%} {%pipe,translateComma=$content[payout_total]%} $content[type] - $content[target_account] - $content[target_bank] + {%pipe,fixEmptyContentToDashes=$content[target_account]%} + {%pipe,fixEmptyContentToDashes=$content[target_bank]%} $content[payout_timestamp] $content[status] diff --git a/templates/de/html/admin/admin_list_primera_row.tpl b/templates/de/html/admin/admin_list_primera_row.tpl index d4505735c5..af5f5e35d6 100644 --- a/templates/de/html/admin/admin_list_primera_row.tpl +++ b/templates/de/html/admin/admin_list_primera_row.tpl @@ -5,6 +5,6 @@ {%pipe,translateComma=$content[primera_amount]%} $content[primera_timestamp] {%pipe,PRIMERA_TRANSFER_STATUS=$content[primera_type]%} - $content[primera_api_message] + {%pipe,fixEmptyContentToDashes=$content[primera_api_message]%} $content[primera_api_status] diff --git a/templates/de/html/admin/admin_list_rallyes_row.tpl b/templates/de/html/admin/admin_list_rallyes_row.tpl index c11b7d4b1b..0e5f882978 100644 --- a/templates/de/html/admin/admin_list_rallyes_row.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row.tpl @@ -6,7 +6,7 @@ {--RALLYE_DESCR2--}:
- $content[descr] + {%pipe,fixEmptyContentToDashes=$content[descr]%} {--RALLYE_ADMIN_ID--}:
@@ -24,7 +24,7 @@ {--RALLYE_TEMPLATE2--}:
- $content[template] + {%pipe,fixEmptyContentToDashes=$content[template]%} {--RALLYE_AUTO_ADD--}:
diff --git a/templates/de/html/admin/admin_list_rallyes_row2.tpl b/templates/de/html/admin/admin_list_rallyes_row2.tpl index 586daa5a27..2d6f648558 100644 --- a/templates/de/html/admin/admin_list_rallyes_row2.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row2.tpl @@ -4,9 +4,12 @@ href="{%url=modules.php?module=admin&what=list_user&userid=$content[userid]%}">$content[userid]$content[bold_r] - $content[bold_l]$content[old]$content[bold_r] + $content[bold_l]$content[old]$content[bold_r] + - $content[bold_l]$content[cnt]$content[bold_r] + $content[bold_l]$content[cnt]$content[bold_r] + - $content[bold_l]$content[points]$content[bold_r] + $content[bold_l]$content[points]$content[bold_r] + diff --git a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl index 45020c8091..a635ac1aa2 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl @@ -21,6 +21,6 @@ $content[url_last_locked] - $content[url_lock_reason] + {%pipe,fixEmptyContentToDashes=$content[url_lock_reason]%} diff --git a/templates/de/html/admin/admin_list_task_ext_rows.tpl b/templates/de/html/admin/admin_list_task_ext_rows.tpl index d59653fabd..1c57fc4f6d 100644 --- a/templates/de/html/admin/admin_list_task_ext_rows.tpl +++ b/templates/de/html/admin/admin_list_task_ext_rows.tpl @@ -9,7 +9,7 @@ {--ADMIN_REGISTER_EXTENSION--} - $content[infos] + {%pipe,fixEmptyContentToDashes=$content[infos]%} $content[userid] diff --git a/templates/de/html/admin/admin_list_task_rows.tpl b/templates/de/html/admin/admin_list_task_rows.tpl index 722a03375c..e0d1af287f 100644 --- a/templates/de/html/admin/admin_list_task_rows.tpl +++ b/templates/de/html/admin/admin_list_task_rows.tpl @@ -9,7 +9,7 @@ --- - $content[infos] + {%pipe,fixEmptyContentToDashes=$content[infos]%} $content[userid] diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index 1529a0df5e..b85ec7bf6d 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -10,7 +10,7 @@ {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] - $content[nickname] + {%pipe,fixEmptyContentToDashes=$content[nickname]%} {--EMAIL--}: @@ -48,7 +48,7 @@ {--_UNUSED--}: - $content[lock_reason] + {%pipe,fixEmptyContentToDashes=$content[lock_reason]%} $content[lock_timestamp] --- --- diff --git a/templates/de/html/admin/admin_list_wernis_row.tpl b/templates/de/html/admin/admin_list_wernis_row.tpl index 540543e175..7f3cdce297 100644 --- a/templates/de/html/admin/admin_list_wernis_row.tpl +++ b/templates/de/html/admin/admin_list_wernis_row.tpl @@ -4,7 +4,7 @@ $content[wernis_account] {%pipe,translateComma=$content[wernis_amount]%} $content[wernis_timestamp] - {%pipe,WERNIS_TRANSFER_STATUS=$content[wernis_type]%} - $content[wernis_api_message] + {%pipe,translateWernisTransferStatus=$content[wernis_type]%} + {%pipe,fixEmptyContentToDashes=$content[wernis_api_message]%} $content[wernis_api_status] diff --git a/templates/de/html/admin/admin_mods_edit.tpl b/templates/de/html/admin/admin_mods_edit.tpl index c1ac01c217..9e1b02140d 100644 --- a/templates/de/html/admin/admin_mods_edit.tpl +++ b/templates/de/html/admin/admin_mods_edit.tpl @@ -2,12 +2,12 @@ - - - - - - + + + + + + $content diff --git a/templates/de/html/admin/admin_mods_stats.tpl b/templates/de/html/admin/admin_mods_stats.tpl index 6b8562c355..188edb1f2b 100644 --- a/templates/de/html/admin/admin_mods_stats.tpl +++ b/templates/de/html/admin/admin_mods_stats.tpl @@ -1,11 +1,11 @@
{--MODS_NAME--}{--MODS_TITLE--}{--MODS_IS_LOCKED--}{--MODS_IS_HIDDEN--}{--MODS_IS_ADMIN--}{--MODS_IS_MEMBER--}{--ADMIN_MODS_NAME--}{--ADMIN_MODS_TITLE--}{--ADMIN_MODS_IS_LOCKED--}{--ADMIN_MODS_IS_HIDDEN--}{--ADMIN_MODS_IS_ADMIN--}{--ADMIN_MODS_IS_MEMBER--}
- - + + $content - +
{--MODS_TITLE--}{--MODS_CLICKS--}{--ADMIN_MODS_TITLE--}{--ADMIN_MODS_CLICKS--}
{--MODS_ADMIN_EDIT_NOTE--}
{--ADMIN_MODS_EDIT_NOTE--}
diff --git a/templates/de/html/admin/admin_mods_stats2.tpl b/templates/de/html/admin/admin_mods_stats2.tpl index e0d42bb871..396118ecbb 100644 --- a/templates/de/html/admin/admin_mods_stats2.tpl +++ b/templates/de/html/admin/admin_mods_stats2.tpl @@ -1,8 +1,8 @@
- - + + $content diff --git a/templates/de/html/admin/admin_mods_stats2_row.tpl b/templates/de/html/admin/admin_mods_stats2_row.tpl index d1d9477885..3ffabc3e98 100644 --- a/templates/de/html/admin/admin_mods_stats2_row.tpl +++ b/templates/de/html/admin/admin_mods_stats2_row.tpl @@ -1,6 +1,6 @@ @@ -164,7 +164,7 @@
{--MODS_WHAT_ACTION--}{--MODS_CLICKS--}{--ADMIN_MODS_WHAT_ACTION--}{--ADMIN_MODS_CLICKS--}
-  $content[title] ($content[action]) + {%pipe,fixEmptyContentToDashes=$content[title]%} ($content[action]) $content[counter] diff --git a/templates/de/html/admin/admin_mods_stats_row.tpl b/templates/de/html/admin/admin_mods_stats_row.tpl index 23b68467c4..3f9be95aa2 100644 --- a/templates/de/html/admin/admin_mods_stats_row.tpl +++ b/templates/de/html/admin/admin_mods_stats_row.tpl @@ -1,6 +1,6 @@
-  $content[title] ($content[module]) + {%pipe,fixEmptyContentToDashes=$content[title]%} ($content[module]) $content[clicks] diff --git a/templates/de/html/admin/admin_overview_list_ext_rows.tpl b/templates/de/html/admin/admin_overview_list_ext_rows.tpl index 1ac84724f9..4286166d44 100644 --- a/templates/de/html/admin/admin_overview_list_ext_rows.tpl +++ b/templates/de/html/admin/admin_overview_list_ext_rows.tpl @@ -9,7 +9,7 @@ {--ADMIN_REGISTER_EXTENSION--} - $content[infos] + {%pipe,fixEmptyContentToDashes=$content[infos]%} $content[userid] diff --git a/templates/de/html/admin/admin_overview_list_rows.tpl b/templates/de/html/admin/admin_overview_list_rows.tpl index b50b5a1a58..1f4a4fcf2f 100644 --- a/templates/de/html/admin/admin_overview_list_rows.tpl +++ b/templates/de/html/admin/admin_overview_list_rows.tpl @@ -9,7 +9,7 @@ --- - $content[infos] + {%pipe,fixEmptyContentToDashes=$content[infos]%} $content[userid] diff --git a/templates/de/html/admin/admin_task_holiday.tpl b/templates/de/html/admin/admin_task_holiday.tpl index 57cc966160..6090f85fa2 100644 --- a/templates/de/html/admin/admin_task_holiday.tpl +++ b/templates/de/html/admin/admin_task_holiday.tpl @@ -1 +1 @@ -{--HOLIDAY_ADMIN_DEL_LINK--} +{--ADMIN_HOLIDAY_DEL_LINK--} diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 0e0b429111..537b762f31 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -84,7 +84,7 @@ {--ADMIN_LAST_MODULE--}:
- $content[last_module] + {%pipe,fixEmptyContentToDashes=$content[last_module]%} 		{--HAS_JOINED--}:
@@ -109,7 +109,7 @@ $content[refs] 		- {--TOTAL_CATS--}:
+ {--TOTAL_CATEGORIES--}:
$content[cats]
{--LOCK_REASON--}:
- $content[lock_reason] + {%pipe,fixEmptyContentToDashes=$content[lock_reason]%}