From 6a3ee64cde189d591209e4d3dd1031cb3b58420d Mon Sep 17 00:00:00 2001 From: quix0r Date: Sat, 9 Jul 2011 16:28:42 +0000 Subject: [PATCH] Bonus mails are now editable, duplicate message ids cleaned up: - Bonus mails can now be edited - Generation of admin mail links now fully working - Many duplicate message ids removed - TODOs.txt updated --- .gitattributes | 2 + DOCS/TODOs.txt | 24 ++-- inc/extensions/ext-bonus.php | 13 +- inc/filter-functions.php | 3 + inc/filter/bonus_filter.php | 12 ++ inc/filters.php | 12 ++ inc/functions.php | 30 ++++- inc/language/admins_de.php | 10 +- inc/language/bonus_de.php | 27 ++-- inc/language/de.php | 32 ++--- inc/language/network_de.php | 8 -- inc/language/payout_de.php | 2 - inc/language/rallye_de.php | 4 - inc/language/sponsor_de.php | 2 - inc/language/user_de.php | 8 +- inc/modules/admin/what-edit_emails.php | 122 ++++++++++++++---- inc/template-functions.php | 4 +- .../de/html/admin/admin_config_payouts.tpl | 4 +- .../html/admin/admin_config_rallye_prices.tpl | 4 +- .../de/html/admin/admin_delete_admins.tpl | 4 +- .../de/html/admin/admin_delete_reflevel.tpl | 2 +- templates/de/html/admin/admin_edit_admins.tpl | 4 +- .../de/html/admin/admin_edit_admins_acls.tpl | 2 +- .../de/html/admin/admin_edit_bonus_email.tpl | 42 ++++++ templates/de/html/admin/admin_edit_email.tpl | 10 +- .../de/html/admin/admin_edit_payouts.tpl | 2 +- .../de/html/admin/admin_edit_refbanner.tpl | 2 +- templates/de/html/admin/admin_edit_theme.tpl | 2 +- .../de/html/admin/admin_email_archiv_row.tpl | 2 +- templates/de/html/admin/admin_extensions.tpl | 2 +- .../de/html/admin/admin_links_bonus_mail.tpl | 10 ++ templates/de/html/admin/admin_list_admins.tpl | 2 +- .../de/html/admin/admin_list_admins_acls.tpl | 4 +- .../de/html/admin/admin_list_bank_package.tpl | 2 +- .../admin/admin_list_bonus_emails_row.tpl | 5 - .../de/html/admin/admin_list_country.tpl | 2 +- .../html/admin/admin_list_email_max_rec.tpl | 4 +- .../de/html/admin/admin_list_imprint.tpl | 2 +- .../admin_list_network_api_translation.tpl | 4 +- .../html/admin/admin_list_network_params.tpl | 4 +- .../html/admin/admin_list_network_types.tpl | 4 +- .../de/html/admin/admin_list_networks.tpl | 4 +- .../de/html/admin/admin_list_payments.tpl | 4 +- .../de/html/admin/admin_list_rallyes.tpl | 4 +- .../de/html/admin/admin_list_refbanner.tpl | 4 +- .../de/html/admin/admin_list_sponsor_pay.tpl | 4 +- templates/de/html/admin/admin_list_task.tpl | 2 +- .../de/html/admin/admin_overview_table.tpl | 2 +- 48 files changed, 310 insertions(+), 154 deletions(-) create mode 100644 templates/de/html/admin/admin_edit_bonus_email.tpl create mode 100644 templates/de/html/admin/admin_links_bonus_mail.tpl diff --git a/.gitattributes b/.gitattributes index a0e7674c33..0230b49198 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1146,6 +1146,7 @@ templates/de/html/admin/admin_edit_admins_acls_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_admins_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_bank_packages.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_bank_packages_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_bonus_email.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_cats.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_cats_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_email.tpl svneol=native#text/plain @@ -1208,6 +1209,7 @@ templates/de/html/admin/admin_import_theme.tpl svneol=native#text/plain templates/de/html/admin/admin_import_theme_form.tpl svneol=native#text/plain templates/de/html/admin/admin_import_theme_none.tpl svneol=native#text/plain templates/de/html/admin/admin_import_theme_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_links_bonus_mail.tpl svneol=native#text/plain templates/de/html/admin/admin_list_admins.tpl svneol=native#text/plain templates/de/html/admin/admin_list_admins_acls.tpl svneol=native#text/plain templates/de/html/admin/admin_list_admins_acls_row.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 1c303ffead..e75e4b1000 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -55,9 +55,9 @@ ./inc/functions.php:2200: // @TODO Rename column data_type to e.g. mail_status ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter ./inc/install-functions.php:57: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0); -./inc/language/de.php:1079: // @TODO Rewrite these two constants -./inc/language/de.php:1100: // @TODO Rewrite these three constants -./inc/language/de.php:771:// @TODO Are these constants longer used? +./inc/language/de.php:1073: // @TODO Rewrite these two constants +./inc/language/de.php:1089: // @TODO Rewrite these three constants +./inc/language/de.php:763:// @TODO Are these constants longer used? ./inc/language-functions.php:255: // @TODO These are all valid languages, again hard-coded ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function. ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no * @@ -84,7 +84,7 @@ ./inc/libs/surfbar_functions.php:1595: // @TODO This can be somehow rewritten ./inc/libs/surfbar_functions.php:708:// @TODO Can't we use our new expression language instead of this ugly code? ./inc/libs/surfbar_functions.php:997: // @TODO Invalid salt should be refused -./inc/libs/task_functions.php:240: // @TODO These can be rewritten to filter +./inc/libs/task_functions.php:247: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters ./inc/libs/theme_functions.php:93: // @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? @@ -142,8 +142,8 @@ ./inc/modules/admin/what-list_refs.php:107: // @TODO Try to rewrite some to EL ./inc/modules/admin/what-list_unconfirmed.php:107: // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus ./inc/modules/admin/what-list_unconfirmed.php:84: // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}'); -./inc/modules/admin/what-list_user.php:251: // @TODO Rewrite this into a filter -./inc/modules/admin/what-list_user.php:294: // @TODO Rewrite this into a filter +./inc/modules/admin/what-list_user.php:254: // @TODO Rewrite this into a filter +./inc/modules/admin/what-list_user.php:297: // @TODO Rewrite this into a filter ./inc/modules/admin/what-logs.php:64: // @TODO Fix content-type here ./inc/modules/admin/what-logs.php:70: // @TODO Fix content-type here ./inc/modules/admin/what-mem_add.php:124: // @TODO This can be somehow rewritten to a function @@ -177,12 +177,12 @@ ./inc/modules/member/what-unconfirmed.php:203: // @TODO This 'userid' cannot be saved because of encapsulated EL code ./inc/modules/order.php:74: // @TODO Unused: 2,4 ./inc/monthly/monthly_bonus.php:64: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1223: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1485: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:1573: // @TODO Rewrite these lines to a filter -./inc/mysql-manager.php:1597: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1961: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:2005:// @TODO Fix inconsistency between last_module and getWhat() +./inc/mysql-manager.php:1241: // @TODO Rewrite this to a filter +./inc/mysql-manager.php:1503: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:1591: // @TODO Rewrite these lines to a filter +./inc/mysql-manager.php:1615: // @TODO Rewrite this to a filter +./inc/mysql-manager.php:1979: // @TODO Rewrite this to a filter +./inc/mysql-manager.php:2023:// @TODO Fix inconsistency between last_module and getWhat() ./inc/mysql-manager.php:371: // @TODO Try to rewrite this to one or more functions ./inc/mysql-manager.php:44:// @TODO Can we cache this? ./inc/purge/purge-inact.php:55: // @TODO Rewrite these if() blocks to a filter diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index da0d825554..1b9114732b 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version of this extension -setThisExtensionVersion('0.9.4'); +setThisExtensionVersion('0.9.5'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '0.1.6', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4')); +setExtensionVersionHistory(array('0.0.0', '0.1.6', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running @@ -91,6 +91,7 @@ INDEX (`cat_id`)", // Unregister filter unregisterFilter(__FUNCTION__, __LINE__, 'member_login_check', 'ADD_LOGIN_BONUS', true, isExtensionDryRun()); + unregisterFilter(__FUNCTION__, __LINE__, 'generate_admin_mail_links', 'GENERATE_BONUS_MAIL_LINKS', true, isExtensionDryRun()); break; case 'activate': // Do stuff when admin activates this extension @@ -599,6 +600,14 @@ ORDER BY // Update notes setExtensionUpdateNotes("Konfliktierende SQL-Befehle aus ext-user verschoben."); break; + + case '0.9.5': // SQL queries for v0.9.5 + // Register filter + registerFilter('generate_admin_mail_links', 'GENERATE_BONUS_MAIL_LINKS', true, isExtensionDryRun()); + + // Update notes + setExtensionUpdateNotes("Filter zum Generieren von Admin-Links für Bonus-Mails hinzugefügt."); + break; } // END - switch break; diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 0ec69f0fb3..22a2d5231f 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -187,6 +187,9 @@ ORDER BY // Admin login registerFilter('do_admin_login_done', 'DO_LOGIN_ADMIN'); + + // Admin mail links + registerFilter('generate_admin_mail_links', 'GENERATE_POOL_MAIL_LINKS'); } // "Registers" a new filter function diff --git a/inc/filter/bonus_filter.php b/inc/filter/bonus_filter.php index 34ee440808..d4cf091b80 100644 --- a/inc/filter/bonus_filter.php +++ b/inc/filter/bonus_filter.php @@ -84,5 +84,17 @@ LIMIT 1', return $data; } +// Filter for generating admin mail links for bonus mails +function FILTER_GENERATE_BONUS_MAIL_LINKS ($data) { + // Is the type 'bid'? + if ($data['type'] == 'bid') { + // Load template + $data['__output'] .= loadTemplate('admin_links_bonus_mail', true, $data); + } // END - if + + // Return data + return $data; +} + // [EOF] ?> diff --git a/inc/filters.php b/inc/filters.php index ae2bc37ccd..c6c27638b7 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -1087,5 +1087,17 @@ function FILTER_EXTENSION_MARK_INSTALLED ($data) { $GLOBALS['ext_is_installed'][$data['ext_name']] = true; } +// Filter for generating mails links for 'pool' mails +function FILTER_GENERATE_POOL_MAIL_LINKS ($data) { + // Is type 'mid'? + if ($data['type'] == 'mid') { + // Load template + $data['__output'] .= loadTemplate('admin_links_' . strtolower($data['mail_status']) . '_pool_mail', true, $data); + } // END - if + + // Return data + return $data; +} + // [EOF] ?> diff --git a/inc/functions.php b/inc/functions.php index e89e002839..6c44c5f1ca 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2220,13 +2220,26 @@ function generateAdminMailLinks ($mailType, $mailId) { if (!empty($table)) { // Query for the mail $result = SQL_QUERY_ESC("SELECT `id`, `%s` AS `mail_status` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `id`=%s LIMIT 1", - array($statusColumn, $table, bigintval($mailId)), __FILE__, __LINE__); + array( + $statusColumn, + $table, + bigintval($mailId) + ), __FILE__, __LINE__); // Do we have one entry there? if (SQL_NUMROWS($result) == 1) { // Load the entry $content = SQL_FETCHARRAY($result); - die('Unfinished area:
'.__FUNCTION__.':
content=
'.print_r($content, true).'
'); + + // Add output and type + $content['type'] = $mailType; + $content['__output'] = ''; + + // Filter all data + $content = runFilterChain('generate_admin_mail_links', $content); + + // Get output back + $OUT = $content['__output']; } // END - if // Free result @@ -2239,7 +2252,7 @@ function generateAdminMailLinks ($mailType, $mailId) { /** - * determine if a string can represent a number in hexadecimal + * Determine if a string can represent a number in hexadecimal * * @param $hex A string to check if it is hex-encoded * @return $foo True if the string is a hex, otherwise false @@ -2259,9 +2272,14 @@ function isHexadecimal ($hex) { return ($hex == dechex(hexdec($hex))); } -// Replace "\r" with "[r]" and "\n" with "[n]" and add a final new-line to make -// them visible to the developer. Use this function to debug e.g. buggy HTTP -// response handler functions. +/** + * Replace "\r" with "[r]" and "\n" with "[n]" and add a final new-line to make + * them visible to the developer. Use this function to debug e.g. buggy HTTP + * response handler functions. + * + * @param $str String to overwork + * @return $str Overworked string + */ function replaceReturnNewLine ($str) { return str_replace("\r", '[r]', str_replace("\n", '[n] ', $str)); diff --git a/inc/language/admins_de.php b/inc/language/admins_de.php index d6b0feb8a7..f089173e2f 100644 --- a/inc/language/admins_de.php +++ b/inc/language/admins_de.php @@ -49,14 +49,12 @@ addMessages(array( 'ADMIN_ADMINS_ENTER_PASS1' => "Passwort eingeben", 'ADMIN_ADMINS_ENTER_PASS2' => "Passwort wiederholen", 'ADMIN_ADMINS_ADD_DONE' => "Das Admin-Account wurde angelegt.", - 'ADMIN_ADMINS_EDIT_ACCOUNTS' => "Admin-Accounts verwalten", - 'ADMIN_ADMINS_EDIT' => "Bearbeiten", - 'ADMIN_ADMINS_DELETE' => "Löschen", + 'ADMIN_ADMINS_EDIT_ACCOUNTS_TITLE' => "Admin-Accounts verwalten", 'ADMIN_ADMINS_CONTACT' => "Admin-Login", 'ADMIN_ADMINS_EMAIL' => "E-Mail Adresse", 'ADMIN_ADMINS_PASSWORD' => "Passwort und Wiederholung", 'ADMIN_ADMINS_EDIT_NOTE' => "Bitte beachten Sie, dass Sie nur dann das Passwort zweimal eingeben müssen, wenn Sie es ändern wollen. Wollen Sie nur die Daten ändern, brauchen Sie kein Passwort eingeben.", - 'ADMIN_ADMINS_DELETE_ACCOUNTS' => "Wollen Sie wirklich diese Accounts löschen?", + 'ADMIN_ADMINS_DELETE_ACCOUNTS_TITLE' => "Wollen Sie wirklich diese Accounts löschen?", 'ADMIN_ADMINS_CANNOT_DELETE_LAST' => "Das letzte Admin-Account kann nicht gelöscht werden.", 'ADMIN_ADMINS_SELECT_ADMIN' => "Bitte wählen Sie einen Administrator aus dem Menüpunkt Admin-Account ändern aus.", 'ADMIN_ADMINS_ADMIN_ID' => "Admin-Id", @@ -82,10 +80,8 @@ addMessages(array( 'ADMIN_ADMINS_ACL_ALREADY_ADDED' => "Zugriffskontrollzeile bereits hinzugefügt.", 'ADMIN_ADMINS_ACL_SAVED' => "Zugriffskontrollzeile gespeichert.", 'ADMIN_ADMINS_LIST_ACLS' => "Alle angelgten Zugriffkontrollzeilen auflisten", - 'ADMIN_ADMINS_EDIT_ACLS_SUBMIT' => "Editieren", - 'ADMIN_ADMINS_DELETE_ACLS_SUBMIT' => "Löschen", 'ADMIN_ADMINS_LOGIN_ID' => "Admin-Login", - 'ADMIN_ADMINS_EDIT_ACLS' => "Zugriffkontrollzeilen ändern", + 'ADMIN_ADMINS_EDIT_ACLS_TITLE' => "Zugriffkontrollzeilen ändern", 'ADMIN_ADMINS_DELETE_ACLS' => "Zugriffkontrollzeilen löschen", 'ADMIN_ADMINS_CHANGE_ACLS_SUBMIT' => "Einträge ändern", 'ADMIN_ADMINS_REMOVE_ACLS_SUBMIT' => "Einträge löschen", diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php index 78fc3ede91..27fcdab34e 100644 --- a/inc/language/bonus_de.php +++ b/inc/language/bonus_de.php @@ -64,8 +64,7 @@ addMessages(array( 'MEMBER_BONUS_POINTS_TITLE' => "Sonderbonus-{?POINTS?}", 'MEMBER_BONUS_RANK_YOU_ARE_404' => "Sie haben bis jetzt noch keine Aktiv-Vergütung erhalten.", 'BONUS_RANK' => "Platz", - 'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine Übersicht, wer alles {?POINTS?} für die Mail %s - erhalten hat", + 'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine Übersicht, wer alles {?POINTS?} für die Mail %s erhalten hat", 'MEMBER_BONUS_SHOW_YOU_HAVE_CONFIRMED' => "Sie haben diese Mail am", 'MEMBER_BONUS_SHOW_CONFIRMED_BONUS_IS' => "Stelle bestätigt. Ihre Zusatz-Gutschrift für diese Mail", 'MEMBER_BONUS_TOTAL' => "Gesamtbonus", @@ -121,21 +120,27 @@ addMessages(array( 'ADMIN_NOTIFY_MAIL_ALREADY_DELETED' => "Benachrichtigung bereits entfernt.", 'ADMIN_NOTIFICATION_DELETED_TITLE' => "Benachrichtigung entfernt", 'ADMIN_NO_NOTIFICATIONS' => "Keine Benachrichtigungen gefunden.", + 'ADMIN_LINKS_BONUS_MAIL_TITLE' => "Bonus-Mail %s:", + 'ADMIN_EDIT_BONUS_EMAIL_TITLE' => "Daten der Bonus-Mail Nr. %s ändern", -// Switches - 'ADMIN_CONFIG_BONUS_RALLYE_IS_ACTIVE' => "Ist die Aktiv-Rallye aktiv?", - 'ADMIN_CONFIG_BONUS_RALLYE_LOGIN_INCLUDE' => "Login-Bonus in monatlicher Auswertung mit einschliessen?", - 'ADMIN_CONFIG_BONUS_RALLYE_ORDER_INCLUDE' => "Mailbuchungsbonus in monatlicher Auswertung mit einschliessen?", - 'ADMIN_CONFIG_BONUS_RALLYE_STATS_INCLUDE' => "Statistik-Bonus in monatlicher Auswertung mit einschliessen?", - 'ADMIN_CONFIG_BONUS_RALLYE_CLICK_INCLUDE' => "Mailbestätigungsbonus in monatlicher Auswertung mit einschliessen?", - 'ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE' => "Referal-Bonus in monatlicher Auswertung mit einschliessen?", + // Switches + 'ADMIN_CONFIG_BONUS_RALLYE_IS_ACTIVE' => "Ist die Aktiv-Rallye aktiv?", + 'ADMIN_CONFIG_BONUS_RALLYE_LOGIN_INCLUDE' => "Login-Bonus in monatlicher Auswertung mit einschliessen?", + 'ADMIN_CONFIG_BONUS_RALLYE_ORDER_INCLUDE' => "Mailbuchungsbonus in monatlicher Auswertung mit einschliessen?", + 'ADMIN_CONFIG_BONUS_RALLYE_STATS_INCLUDE' => "Statistik-Bonus in monatlicher Auswertung mit einschliessen?", + 'ADMIN_CONFIG_BONUS_RALLYE_CLICK_INCLUDE' => "Mailbestätigungsbonus in monatlicher Auswertung mit einschliessen?", + 'ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE' => "Referal-Bonus in monatlicher Auswertung mit einschliessen?", -// Header + // Header 'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail %s:", -// Subject lines + // Subject lines 'MEMBER_BONUS_RALLYE_DISABLE_SUBJECT' => "HINWEIS: Aktiv-Rallye gestoppt.", 'MEMBER_BONUS_RALLYE_ENABLE_SUBJECT' => "HINWEIS: Aktiv-Rallye ist am Laufen.", + + // Admin 'bonus' mail actions + 'ADMIN_EDIT_BONUS_MAIL_LINK' => "Bonus-Mail bearbeiten", + 'ADMIN_DELETE_BONUS_MAIL_LINK' => "Bonus-Mail SOFORT löschen", )); // [EOF] diff --git a/inc/language/de.php b/inc/language/de.php index 51adea1f6e..832fdcac51 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -185,8 +185,6 @@ addMessages(array( 'ADMIN_EDIT_DELETE_MAX_VALUES_TITLE' => "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_DELETE_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", @@ -335,8 +333,6 @@ addMessages(array( 'ADMIN_PAYMENT_PAYMENT' => "Vergütete {?POINTS?}", 'ADMIN_PAYMENT_PRICE' => "{?POINTS?}-Kosten", 'ADMIN_PAYMENT_TITLE' => "Mailname", - 'ADMIN_EDIT_PAYMENT' => "Editeren", - 'ADMIN_DELETE_PAYMENT' => "Löschen", 'ENTER_URL' => "Banner-URL", 'ENTER_ALTERNATE' => "Alternativen Text", 'ADMIN_SELECT_VISIBLE' => "Ist der Banner aktiv?", @@ -424,7 +420,6 @@ addMessages(array( 'GUEST_FRAMETESTER_TOP' => "Sollte dieser Text verschwinden, enthält Ihre Webseite einen Frame-Killer.", 'ADMIN_SELECT_EMAIL_EDIT' => "Email auswählen, um diese zu editieren", 'RESET_SELECT' => "Auswahl zurücknehmen", - 'ADMIN_EDIT_EMAIL' => "Mailbuchung bearbeiten", 'ADMIN_CHANGE_EMAIL' => "Änderungen speichern", 'ADMIN_EDIT_URL' => "URL bearbeiten", 'ADMIN_EDIT_EMAIL_SUBJECT' => "Betreff bearbeiten", @@ -563,7 +558,6 @@ addMessages(array( 'ADMIN_CHANGE_REFERAL_DEPTHS' => "Referal-Ebenen ändern", 'ADMIN_REFERAL_DEPTHS_ID' => "Ref-Level id", 'ADMIN_CHANGE_REF' => "Ändern", - 'ADMIN_REMOVE_REF' => "Löschen", 'ADMIN_REFERAL_DEPTHS_SAVED' => "Referal-Ebenen gespeichert...", 'ADMIN_REFERAL_DEPTHS_DELETED' => "Referal-Ebenen gelöscht...", 'ADMIN_EDIT_PAYMENT_TITLE' => "Mailvergütungen editieren", @@ -620,7 +614,7 @@ addMessages(array( 'ADMIN_UNKNOWN_TASK_TYPE' => "Unbekannter Aufgabentyp %s für Aufgabe %s erkannt.", 'ADMIN_TASK_SYSTEM_WELCOME' => "Task-Management Ihres {?mt_word2?}", 'ADMIN_UNSELECT_ALL' => "Alles abwählen", - 'ADMIN_ASSIGN_TASKS' => "Bearbeiten", + 'ADMIN_ASSIGN_TASKS' => "Zuweisen/Bearbeiten", 'ADMIN_UNASSIGN_TASKS' => "Zuweisung aufheben", 'ADMIN_REDIRECT_TASKS' => "Weiterleiten", 'GUEST_STATS' => "Statistiken unseres {?mt_word2?}", @@ -674,7 +668,6 @@ addMessages(array( 'ADMIN_EXTENSION_CHANGED' => "Es wurden %s Erweiterungen geändert.", 'ADMIN_EXTENSION_EDITED' => "Es wurden %s Erweiterungen editiert.", 'ADMIN_EXTENSION_REGISTER_NEXT_LINK' => "Weiter zur Task-Übersicht...", - 'ADMIN_DELETE_ENTRIES' => "Löschen", 'ADMIN_REGISTERED_EXTENSIONS' => "Registrierte Erweiterungen", 'ADMIN_EXTENSION_NAME' => "Erweiterungsname", 'ADMIN_EXTENSION_ACTIVE' => "Aktiviert?", @@ -695,6 +688,7 @@ addMessages(array( 'GUEST_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_EDIT_EMAIL_TITLE' => "Daten der Klick-Mail Nr. %s bearbeiten", 'ADMIN_DELETE_PAYMENT_TITLE' => "Mailvergütungen löschen", 'ADMIN_CONFIG_REFERAL_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.", @@ -724,8 +718,6 @@ addMessages(array( 'GUEST_TOPTEN_STATS' => "Die am häufigsten angeklickten Menüs", 'GUEST_TOP_GUEST_STATS' => "Gastmenü", 'GUEST_TOP_MEMBER_STATS' => "Mitgliedmenü", - 'ADMIN_DELETE_REFERAL_BANNER' => "Löschen", - 'ADMIN_EDIT_REFERAL_BANNER' => "Editieren", 'ADMIN_EDIT_REFERAL_BANNER_URL' => "Banner-URL ändern", 'ADMIN_EDIT_REFERAL_BANNER_ALTERNATIVE_TEXT' => "Alternativen Text ändern", 'ADMIN_EDIT_POINT_SETTINGS' => "EInstellungen an den {?POINTS?}vergütungen", @@ -895,7 +887,6 @@ addMessages(array( 'ADMIN_LIST_REFERALS' => "Referal-Übersicht des Mitgliedes %s in allen Ebenen:", 'ADMIN_LIST_REFERALS_LEVEL' => "Referals in Ebene %s:", 'ADMIN_LIST_REFERALS_NOTE' => "Änderung: Klicken Sie die Mitglieder-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.", - 'ADMIN_DELETE_NORMAL_MAIL' => "Mitglieder-Mail löschen", 'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gelöscht.", 'INITIAL_RELEASE' => "Erstes Release fertiggestellt.", 'DEVELOPER_RELEASE' => "Entwickler-Version zum Testen.", @@ -1069,6 +1060,10 @@ addMessages(array( 'MEMBER_REFERAL_LINKS_FOOTER' => "Ihr Referal-Link eingebaut in Ihrer Homepage bringt Ihnen passiv mehr Referals. (Aber Ihren Referal-Link bewerben schadet auch nicht... ;-) )", 'POINTS_ORDER' => "Werbeguthaben", 'MEMBER_TOTAL_POINTS' => "Gesamtguthaben", + 'ADMIN_UNSUPPORTED_MAIL_TYPE_DETECTED' => "Nicht unterstützer Mail-Typ %s erkannt. Bitte melden Sie dies im Support-Forum.", + 'ADMIN_EDIT_EMAIL_FAILED' => "Änderungen an der Mail nicht gespeichert, bitte kontaktieren Sie den Support.", + 'ADMIN_EMAIL_CHANGES_SAVED' => "Die Maildaten wurden aktualisiert.", + 'ADMIN_EMAIL_CHANGES_NOT_SAVED' => "Keine Änderungen an der Mail vorgenommen. Maildaten wurden NICHT geändert.", 'MEMBER_MAIL_BONUS_CONFIRMED_ON' => "Sie haben diese Bonusmail %s bestätigt.", 'MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN' => "Es konnte nicht festgestellt werden, wann Sie die Bonus-Mail %s bestätigt hatten.", @@ -1086,11 +1081,6 @@ addMessages(array( 'EMAIL_STATUS_QUEUE' => "Wird versendet", 'EMAIL_STATUS_TEMP' => "Wird gerade gebucht", - // Admin mail links - 'ADMIN_LIST_BONUS_EMAILS_ADMIN_LINKS' => "Bonusmail bearbeiten:", - 'ADMIN_LIST_NORMAL_EMAILS_ADMIN_LINKS' => "Mitglied-Mail bearbeiten:", - 'ADMIN_UNSUPPORTED_MAIL_TYPE_DETECTED' => "Nicht unterstützer Mail-Typ %s erkannt. Bitte melden Sie dies im Support-Forum.", - // Member activity 'MEMBER_ACTIVITY_ACTIVE' => "Aktiv", 'MEMBER_ACTIVITY_INACTIVE' => "Inaktiv", @@ -1173,6 +1163,16 @@ addMessages(array( // XML related strings 'XML_TEMPLATE_404' => "XML-Template %s "Bearbeiten", + 'ADMIN_ACTION_CHANGE_SUBMIT' => "Editierungen ausführen", + 'ADMIN_ACTION_DELETE_SUBMIT' => "Löschen", + 'ADMIN_ACTION_REMOVE_SUBMIT' => "Einträge löschen", + + // Admin 'pool' mail actions + 'ADMIN_EDIT_POOL_MAIL_LINK' => "Klick-Mail bearbeiten", + 'ADMIN_DELETE_POOL_MAIL_LINK' => "Klick-Mail löschen", )); // Description of all months diff --git a/inc/language/network_de.php b/inc/language/network_de.php index c0331ecadc..86122cafe9 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -89,25 +89,17 @@ addMessages(array( 'ADMIN_NETWORK_LIST_ERROR_CODES_LINK_TITLE' => "Weiter zu den Fehlercodes", // - Buttons 'ADMIN_NETWORK_ADD' => "Allgemeine Daten anlegen", - 'ADMIN_NETWORK_EDIT' => "Editieren", 'ADMIN_NETWORK_CHANGE' => "Daten ändern", - 'ADMIN_NETWORK_DELETE' => "Löschen", 'ADMIN_NETWORK_REMOVE' => "Daten entfernen", 'ADMIN_NETWORK_CHOOSE' => "Werbenetzwerk auswählen", 'ADMIN_NETWORK_TYPE_CHOOSE' => "Werbeart-Handler auswählen", 'ADMIN_NETWORK_TYPES_ADD' => "Werbeart hinzufügen", - 'ADMIN_NETWORK_TYPES_EDIT' => "Editieren", - 'ADMIN_NETWORK_TYPES_DELETE' => "Löschen", 'ADMIN_NETWORK_TYPES_CHANGE' => "Handler ändern", 'ADMIN_NETWORK_TYPES_REMOVE' => "Handler entfernen", 'ADMIN_NETWORK_REQUEST_PARAMETER_ADD' => "API-Parameter hinzufügen", - 'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT' => "Editieren", - 'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE' => "Löschen", 'ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE' => "API-Parameter ändern", 'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE' => "API-Parameter entfernen", 'ADMIN_NETWORK_API_TRANSLATION_ADD' => "API-Arrayelement hinzufügen", - 'ADMIN_NETWORK_API_TRANSLATION_EDIT' => "Editieren", - 'ADMIN_NETWORK_API_TRANSLATION_DELETE' => "Löschen", // - Success titles 'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugefügt", 'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugefügt", diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index dd95305f7b..961cf08b4b 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -56,8 +56,6 @@ addMessages(array( 'ADMIN_PAYOUT_EDIT_DELETE_TITLE' => "Editieren / Löschen von Auszahlungstypen", 'ADMIN_PAYOUT_EDIT_TITLE' => "Ausgwählte Einträge editieren", 'ADMIN_PAYOUT_DELETE_TITLE' => "Ausgwählte Einträge löschen", - 'ADMIN_PAYOUT_EDIT' => "Editieren", - 'ADMIN_PAYOUT_DELETE' => "Löschen", 'ADMIN_PAYOUT_NO_MEMBER_REQUESTS' => "Keine Auszahlungsanfragen von Ihren Mitgliedern erhalten.", 'ADMIN_PAYOUT_ENTRIES_CHANGED' => "Einträge wurden geändert.", 'ADMIN_PAYOUT_ENTRIES_DELETED' => "Einträge wurden gelölscht.", diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php index cb09da98cd..f85446e806 100644 --- a/inc/language/rallye_de.php +++ b/inc/language/rallye_de.php @@ -68,16 +68,12 @@ addMessages(array( 'RALLYE_LEVEL' => "Platz", 'RALLYE_PRICE_INFO' => "Infos", 'RALLYE_EDIT_SELECTED_PRICES' => "Preise/Plätze ändern", - 'RALLYE_EDIT_PRICES' => "Editieren", - 'RALLYE_DELETE_PRICES' => "Löschen", 'RALLYE_CHANGE_PRICES' => "Ändern", 'RALLYE_ID' => "Rallye-Id", 'RALLYE_EDIT_DELETE_RALLYES' => "Ändern / Löschen von Referal-Rallyes (Grunddaten)", 'RALLYE_ADMIN_ID' => "Admin-Login", 'RALLYE_TSTART' => "Anfang", 'RALLYE_TEND' => "Ende", - 'RALLYE_EDIT_ADMIN' => "Editieren", - 'RALLYE_DELETE_ADMIN' => "Löschen", 'RALLYE_EDIT_DELETE_NOTE' => "Wenn Sie die Grunddaten der ausgewählten Referal-Rallyes ändern / löschen wollen, markieren Sie diese per Kästchen. Wollen Sie die Preise ändern, klicken Sie den Referal-Rallye-Titel an. Aktive Referal-Rallyes können nicht geändert werden, sondern müssen erst deaktiviert werden.", 'ADMIN_RALLYE_PRICES_NOTE' => "Wenn Sie die Referal-Rallye-Preise hinzufügen, ändern oder löschen wollen, klicken Sie einfach den Referal-Rallye-Titel an.", 'RALLYE_ENTRIES_DELETED' => "Einträge gelöscht.", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 19b3a8c119..7712838556 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -155,8 +155,6 @@ addMessages(array( 'ADMIN_SPONSOR_PAYTYPE_ADDED' => "Buchungspaket %s hinzugefügt.", 'SPONSOR_LIST_PAYMENT_TYPES_TITLE' => "Buchungspakete auflisten, bearbeiten und löschen", 'SPONSOR_PAYTYPE_MIN_COUNT2' => "Minimum", - 'ADMIN_SPONSOR_PAYTYPE_EDIT' => "Bearbeiten", - 'ADMIN_SPONSOR_PAYTYPE_DELETE' => "Löschen", 'SPONSOR_EDIT_PAY_ENTRIES' => "Buchungspakete editieren", 'SPONSOR_DELETE_PAY_ENTRIES' => "Buchungspakete löschen", 'SPONSOR_PAY_ENTRIES_CHANGED' => "Buchungspakete geändert.", diff --git a/inc/language/user_de.php b/inc/language/user_de.php index c7cdba8f88..2d70481046 100644 --- a/inc/language/user_de.php +++ b/inc/language/user_de.php @@ -50,10 +50,10 @@ addMessages(array( 'ADMIN_USER_ACCOUNT_NOT_SAVED' => "Mitgliedsaccount nicht gespeichert.", 'ADMIN_USER_ACCOUNT_LOCKED' => "Mitgliedsaccount %s wurde gesperrt.", 'ADMIN_USER_ACCOUNT_UNLOCKED' => "Mitgliedsaccount %s wurde freigegeben.", - 'ADMIN_USER_ACTION_LINK_DELETE_USER' => "Löschen", - 'ADMIN_USER_ACTION_LINK_EDIT_USER' => "Ändern", - 'ADMIN_USER_ACTION_LINK_LOCK_USER' => "Sperren", - 'ADMIN_USER_ACTION_LINK_UNLOCK_USER' => "Entsperren", + 'ADMIN_USER_ACTION_LINK_DELETE_USER' => "Mitgliedsdaten löschen", + 'ADMIN_USER_ACTION_LINK_EDIT_USER' => "Mitgliedsdaten bearbeiten", + 'ADMIN_USER_ACTION_LINK_LOCK_USER' => "Mitglied sperren", + 'ADMIN_USER_ACTION_LINK_UNLOCK_USER' => "Mitglied entsperren", 'ADMIN_USER_ACTION_LINK_ADD_POINTS' => "{?POINTS?} aufbuchen", 'ADMIN_USER_ACTION_LINK_SUB_POINTS' => "{?POINTS?} abziehen", 'ADMIN_USER_ACTION_LINK_DELETE_USER_TITLE' => "Mitglied löschen (mit Abfrage)", diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index cf78ba0e33..2c8568c37c 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -47,37 +47,68 @@ if ((isFormSent()) && (!isPostRequestParameterSet('id'))) { unsetPostRequestParameter('ok'); } // END - if -// Query the pool -$result = SQL_QUERY('SELECT - `id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id` +// Form sent or anything else? ;-) +if ((isFormSent()) && (postRequestParameterSet('mid'))) { + // Make mail editable... + $result = SQL_QUERY_ESC("SELECT + `id`, `sender` AS `userid`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` -ORDER BY - `timestamp` ASC', __FILE__, __LINE__); +WHERE + `id`=%s +LIMIT 1", + array(bigintval(postRequestParameter('mid'))), __FILE__, __LINE__); -// Entries found? -if (!SQL_HASZERONUMS($result)) { - if (isFormSent()) { - // Make mail editable... - $result = SQL_QUERY_ESC("SELECT + // Fetch row + $content = SQL_FETCHARRAY($result); + + // Free result + SQL_FREERESULT($result); + + // Load template + loadTemplate('admin_edit_email', false, $content); +} elseif (isGetRequestParameterSet('mid')) { + // Make also this email editable + $result = SQL_QUERY_ESC("SELECT `id`, `sender` AS `userid`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1", - array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__); + array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__); - // Fetch row - $content = SQL_FETCHARRAY($result); + // Fetch row + $content = SQL_FETCHARRAY($result); - // Free result - SQL_FREERESULT($result); + // Free result + SQL_FREERESULT($result); - // Load template - loadTemplate('admin_edit_email', false, $content); - } elseif (isPostRequestParameterSet('save')) { - // Save changes + // Load template + loadTemplate('admin_edit_email', false, $content); +} elseif (isGetRequestParameterSet('bid')) { + // Make also this email editable + $result = SQL_QUERY_ESC("SELECT + `id`, `subject`, `text`, `url` +FROM + `{?_MYSQL_PREFIX?}_bonus` +WHERE + `id`=%s +LIMIT 1", + array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__); + + // Fetch row + $content = SQL_FETCHARRAY($result); + + // Free result + SQL_FREERESULT($result); + + // Load template + loadTemplate('admin_edit_bonus_email', false, $content); +} elseif (isFormSent('save')) { + // Save changes + if (isPostRequestParameterSet('mid')) { + // Update pool SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET @@ -91,18 +122,55 @@ LIMIT 1", postRequestParameter('subject'), postRequestParameter('text'), postRequestParameter('url'), - bigintval(postRequestParameter('id')), + bigintval(postRequestParameter('mid')), ), __FILE__, __LINE__); if (!SQL_HASZEROAFFECTED()) { - $content = '{--SETTINGS_SAVED--}'; + $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}'; } else { - $content = '{--SETTINGS_NOT_SAVED--}'; + $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}'; } + } elseif (isPostRequestParameterSet('bid')) { + // Update pool + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_bonus` +SET + `subject`='%s', + `text`='%s', + `url`='%s' +WHERE + `id`=%s +LIMIT 1", + array( + postRequestParameter('subject'), + postRequestParameter('text'), + postRequestParameter('url'), + bigintval(postRequestParameter('bid')), + ), __FILE__, __LINE__); - // Display message - displayMessage($content); + if (!SQL_HASZEROAFFECTED()) { + $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}'; + } else { + $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}'; + } } else { + // No valid action + $content = '{--ADMIN_EDIT_EMAIL_FAILED--}'; + } + + // Display message + displayMessage($content); +} else { + // Query the pool + $result = SQL_QUERY('SELECT + `id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id` +FROM + `{?_MYSQL_PREFIX?}_pool` +ORDER BY + `timestamp` ASC', __FILE__, __LINE__); + + // Entries found? + if (!SQL_HASZERONUMS($result)) { // There are mail orders available $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { @@ -115,10 +183,10 @@ LIMIT 1", // Load email template loadTemplate('admin_edit_email_select', false, $OUT); + } else { + // No mail orders left in pool + displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}'); } -} else { - // No mail orders left in pool - displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}'); } // [EOF] diff --git a/inc/template-functions.php b/inc/template-functions.php index eeba4db76c..da8d167066 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1784,13 +1784,13 @@ function doTemplateExtensionRegistrationLink ($template, $dummy, $ext_name) { } // Helper function to create bonus mail admin links -function doTemplateAdminBonusMailLinks ($template, $bonusId) { +function doTemplateAdminBonusMailLinks ($template, $dummy, $bonusId) { // Call the inner function return generateAdminMailLinks('bid', $bonusId); } // Helper function to create member mail admin links -function doTemplateAdminMemberMailLinks ($template, $mailId) { +function doTemplateAdminMemberMailLinks ($template, $dummy, $mailId) { // Call the inner function return generateAdminMailLinks('mid', $mailId); } diff --git a/templates/de/html/admin/admin_config_payouts.tpl b/templates/de/html/admin/admin_config_payouts.tpl index 085d394043..5b840ebc4e 100644 --- a/templates/de/html/admin/admin_config_payouts.tpl +++ b/templates/de/html/admin/admin_config_payouts.tpl @@ -16,8 +16,8 @@ - - + + diff --git a/templates/de/html/admin/admin_config_rallye_prices.tpl b/templates/de/html/admin/admin_config_rallye_prices.tpl index d6d5dd9fce..a241a0b8ed 100644 --- a/templates/de/html/admin/admin_config_rallye_prices.tpl +++ b/templates/de/html/admin/admin_config_rallye_prices.tpl @@ -24,8 +24,8 @@ - - + + diff --git a/templates/de/html/admin/admin_delete_admins.tpl b/templates/de/html/admin/admin_delete_admins.tpl index 2d34699469..acfc571de5 100644 --- a/templates/de/html/admin/admin_delete_admins.tpl +++ b/templates/de/html/admin/admin_delete_admins.tpl @@ -3,7 +3,7 @@ @@ -17,7 +17,7 @@
- {--ADMIN_ADMINS_DELETE_ACCOUNTS--} + {--ADMIN_ADMINS_DELETE_ACCOUNTS_TITLE--}
- +
diff --git a/templates/de/html/admin/admin_delete_reflevel.tpl b/templates/de/html/admin/admin_delete_reflevel.tpl index cd24a6afc9..f0ccca9938 100644 --- a/templates/de/html/admin/admin_delete_reflevel.tpl +++ b/templates/de/html/admin/admin_delete_reflevel.tpl @@ -10,7 +10,7 @@ - + diff --git a/templates/de/html/admin/admin_edit_admins.tpl b/templates/de/html/admin/admin_edit_admins.tpl index 4e8734ed91..bf28ead797 100644 --- a/templates/de/html/admin/admin_edit_admins.tpl +++ b/templates/de/html/admin/admin_edit_admins.tpl @@ -2,7 +2,7 @@ @@ -17,7 +17,7 @@
- {--ADMIN_ADMINS_EDIT_ACCOUNTS--} + {--ADMIN_ADMINS_EDIT_ACCOUNTS_TITLE--}
- +
diff --git a/templates/de/html/admin/admin_edit_admins_acls.tpl b/templates/de/html/admin/admin_edit_admins_acls.tpl index 124a53116c..c3f55f54f7 100644 --- a/templates/de/html/admin/admin_edit_admins_acls.tpl +++ b/templates/de/html/admin/admin_edit_admins_acls.tpl @@ -3,7 +3,7 @@ diff --git a/templates/de/html/admin/admin_edit_bonus_email.tpl b/templates/de/html/admin/admin_edit_bonus_email.tpl new file mode 100644 index 0000000000..4f6f0e3d95 --- /dev/null +++ b/templates/de/html/admin/admin_edit_bonus_email.tpl @@ -0,0 +1,42 @@ +
+
+
- {--ADMIN_ADMINS_EDIT_ACLS--}: + {--ADMIN_ADMINS_EDIT_ACLS_TITLE--}:
+ + + + + + + + + + + + + + + + + + +
+ {%message,ADMIN_EDIT_BONUS_EMAIL_TITLE=$content[id]%}: +
+ {--ADMIN_EDIT_URL--}: + + +
+ {--ADMIN_EDIT_EMAIL_SUBJECT--}: + + +
+ {--ADMIN_EDIT_EMAIL_TEXT--}: + + +
+ + + +
+ + diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index 7cc9b7b429..bac4013681 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -3,12 +3,12 @@ diff --git a/templates/de/html/admin/admin_edit_payouts.tpl b/templates/de/html/admin/admin_edit_payouts.tpl index caf648970b..692f8c4ac9 100644 --- a/templates/de/html/admin/admin_edit_payouts.tpl +++ b/templates/de/html/admin/admin_edit_payouts.tpl @@ -17,7 +17,7 @@
- {--ADMIN_EDIT_EMAIL--}: ($content[id]) + {%message,ADMIN_EDIT_EMAIL_TITLE=$content[id]%}:
- {--ADMIN_EDIT_URL--}: + {--ADMIN_EDIT_URL--}: @@ -16,7 +16,7 @@
- {--ADMIN_EDIT_EMAIL_SUBJECT--}: + {--ADMIN_EDIT_EMAIL_SUBJECT--}: @@ -24,7 +24,7 @@
- {--ADMIN_EDIT_EMAIL_TEXT--}: + {--ADMIN_EDIT_EMAIL_TEXT--}: @@ -32,7 +32,7 @@
- +
- +
diff --git a/templates/de/html/admin/admin_edit_refbanner.tpl b/templates/de/html/admin/admin_edit_refbanner.tpl index a53fd2020c..4df09f4cc2 100644 --- a/templates/de/html/admin/admin_edit_refbanner.tpl +++ b/templates/de/html/admin/admin_edit_refbanner.tpl @@ -10,7 +10,7 @@ - + diff --git a/templates/de/html/admin/admin_edit_theme.tpl b/templates/de/html/admin/admin_edit_theme.tpl index 6a6182e69c..1fee672373 100644 --- a/templates/de/html/admin/admin_edit_theme.tpl +++ b/templates/de/html/admin/admin_edit_theme.tpl @@ -14,7 +14,7 @@ - + diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 53a34a13ff..97928a7b59 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -64,6 +64,6 @@ - {--ADMIN_DELETE_NORMAL_MAIL--} + {%template,AdminMemberMailLinks=$content[id]%} diff --git a/templates/de/html/admin/admin_extensions.tpl b/templates/de/html/admin/admin_extensions.tpl index 62691347eb..d66493459d 100644 --- a/templates/de/html/admin/admin_extensions.tpl +++ b/templates/de/html/admin/admin_extensions.tpl @@ -19,7 +19,7 @@ - + diff --git a/templates/de/html/admin/admin_links_bonus_mail.tpl b/templates/de/html/admin/admin_links_bonus_mail.tpl new file mode 100644 index 0000000000..bac470df5f --- /dev/null +++ b/templates/de/html/admin/admin_links_bonus_mail.tpl @@ -0,0 +1,10 @@ +
+
+ {%message,ADMIN_LINKS_BONUS_MAIL_TITLE=$content[id]%} +
+
+ [{--ADMIN_EDIT_BONUS_MAIL_LINK--}|{--ADMIN_DELETE_BONUS_MAIL_LINK--}] +
+
diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl index 03b8bef095..6f56700cf8 100644 --- a/templates/de/html/admin/admin_list_admins.tpl +++ b/templates/de/html/admin/admin_list_admins.tpl @@ -18,7 +18,7 @@ - + diff --git a/templates/de/html/admin/admin_list_admins_acls.tpl b/templates/de/html/admin/admin_list_admins_acls.tpl index a7533695ec..893e55a63c 100644 --- a/templates/de/html/admin/admin_list_admins_acls.tpl +++ b/templates/de/html/admin/admin_list_admins_acls.tpl @@ -17,8 +17,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_bank_package.tpl b/templates/de/html/admin/admin_list_bank_package.tpl index 2d7c716959..29aef88056 100644 --- a/templates/de/html/admin/admin_list_bank_package.tpl +++ b/templates/de/html/admin/admin_list_bank_package.tpl @@ -21,7 +21,7 @@ - + diff --git a/templates/de/html/admin/admin_list_bonus_emails_row.tpl b/templates/de/html/admin/admin_list_bonus_emails_row.tpl index d364abcecd..52843f88d5 100644 --- a/templates/de/html/admin/admin_list_bonus_emails_row.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails_row.tpl @@ -61,11 +61,6 @@ --- - - - {--ADMIN_LIST_BONUS_EMAILS_ADMIN_LINKS--} - - {%template,AdminBonusMailLinks=$content[id]%} diff --git a/templates/de/html/admin/admin_list_country.tpl b/templates/de/html/admin/admin_list_country.tpl index a0d570f95a..ff02f1d2b5 100644 --- a/templates/de/html/admin/admin_list_country.tpl +++ b/templates/de/html/admin/admin_list_country.tpl @@ -18,7 +18,7 @@ - + diff --git a/templates/de/html/admin/admin_list_email_max_rec.tpl b/templates/de/html/admin/admin_list_email_max_rec.tpl index e40f513c10..eebd37c463 100644 --- a/templates/de/html/admin/admin_list_email_max_rec.tpl +++ b/templates/de/html/admin/admin_list_email_max_rec.tpl @@ -15,8 +15,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_imprint.tpl b/templates/de/html/admin/admin_list_imprint.tpl index 306de892c3..ea3fc2007f 100644 --- a/templates/de/html/admin/admin_list_imprint.tpl +++ b/templates/de/html/admin/admin_list_imprint.tpl @@ -16,7 +16,7 @@ - + diff --git a/templates/de/html/admin/admin_list_network_api_translation.tpl b/templates/de/html/admin/admin_list_network_api_translation.tpl index 2c428442cf..0e41203dd9 100644 --- a/templates/de/html/admin/admin_list_network_api_translation.tpl +++ b/templates/de/html/admin/admin_list_network_api_translation.tpl @@ -21,8 +21,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_network_params.tpl b/templates/de/html/admin/admin_list_network_params.tpl index 325a42948e..3e016e2cad 100644 --- a/templates/de/html/admin/admin_list_network_params.tpl +++ b/templates/de/html/admin/admin_list_network_params.tpl @@ -22,8 +22,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl index 056242ec71..2fe523e44b 100644 --- a/templates/de/html/admin/admin_list_network_types.tpl +++ b/templates/de/html/admin/admin_list_network_types.tpl @@ -22,8 +22,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_networks.tpl b/templates/de/html/admin/admin_list_networks.tpl index bc82733d4a..4480b4378b 100644 --- a/templates/de/html/admin/admin_list_networks.tpl +++ b/templates/de/html/admin/admin_list_networks.tpl @@ -22,8 +22,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl index f9a7a89d3d..e8e12ba440 100644 --- a/templates/de/html/admin/admin_list_payments.tpl +++ b/templates/de/html/admin/admin_list_payments.tpl @@ -17,8 +17,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_rallyes.tpl b/templates/de/html/admin/admin_list_rallyes.tpl index 0abf15db75..55889ec705 100644 --- a/templates/de/html/admin/admin_list_rallyes.tpl +++ b/templates/de/html/admin/admin_list_rallyes.tpl @@ -13,8 +13,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_refbanner.tpl b/templates/de/html/admin/admin_list_refbanner.tpl index 7498d4fb61..73945196bd 100644 --- a/templates/de/html/admin/admin_list_refbanner.tpl +++ b/templates/de/html/admin/admin_list_refbanner.tpl @@ -18,8 +18,8 @@ - - + + diff --git a/templates/de/html/admin/admin_list_sponsor_pay.tpl b/templates/de/html/admin/admin_list_sponsor_pay.tpl index 7d8523efc2..c1658963ff 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay.tpl @@ -17,8 +17,8 @@ $content - - + + diff --git a/templates/de/html/admin/admin_list_task.tpl b/templates/de/html/admin/admin_list_task.tpl index 4ec5340251..d180e3baa0 100644 --- a/templates/de/html/admin/admin_list_task.tpl +++ b/templates/de/html/admin/admin_list_task.tpl @@ -22,7 +22,7 @@ $content[rows] - + diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl index f4a3297a5d..8bdd8ebb4d 100644 --- a/templates/de/html/admin/admin_overview_table.tpl +++ b/templates/de/html/admin/admin_overview_table.tpl @@ -22,7 +22,7 @@ $content - + -- 2.39.5