]> git.mxchange.org Git - mailer.git/commitdiff
Bonus mails are now editable, duplicate message ids cleaned up:
authorRoland Häder <roland@mxchange.org>
Sat, 9 Jul 2011 16:28:42 +0000 (16:28 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 9 Jul 2011 16:28:42 +0000 (16:28 +0000)
- Bonus mails can now be edited
- Generation of admin mail links now fully working
- Many duplicate message ids removed
- TODOs.txt updated

48 files changed:
.gitattributes
DOCS/TODOs.txt
inc/extensions/ext-bonus.php
inc/filter-functions.php
inc/filter/bonus_filter.php
inc/filters.php
inc/functions.php
inc/language/admins_de.php
inc/language/bonus_de.php
inc/language/de.php
inc/language/network_de.php
inc/language/payout_de.php
inc/language/rallye_de.php
inc/language/sponsor_de.php
inc/language/user_de.php
inc/modules/admin/what-edit_emails.php
inc/template-functions.php
templates/de/html/admin/admin_config_payouts.tpl
templates/de/html/admin/admin_config_rallye_prices.tpl
templates/de/html/admin/admin_delete_admins.tpl
templates/de/html/admin/admin_delete_reflevel.tpl
templates/de/html/admin/admin_edit_admins.tpl
templates/de/html/admin/admin_edit_admins_acls.tpl
templates/de/html/admin/admin_edit_bonus_email.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_email.tpl
templates/de/html/admin/admin_edit_payouts.tpl
templates/de/html/admin/admin_edit_refbanner.tpl
templates/de/html/admin/admin_edit_theme.tpl
templates/de/html/admin/admin_email_archiv_row.tpl
templates/de/html/admin/admin_extensions.tpl
templates/de/html/admin/admin_links_bonus_mail.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_admins.tpl
templates/de/html/admin/admin_list_admins_acls.tpl
templates/de/html/admin/admin_list_bank_package.tpl
templates/de/html/admin/admin_list_bonus_emails_row.tpl
templates/de/html/admin/admin_list_country.tpl
templates/de/html/admin/admin_list_email_max_rec.tpl
templates/de/html/admin/admin_list_imprint.tpl
templates/de/html/admin/admin_list_network_api_translation.tpl
templates/de/html/admin/admin_list_network_params.tpl
templates/de/html/admin/admin_list_network_types.tpl
templates/de/html/admin/admin_list_networks.tpl
templates/de/html/admin/admin_list_payments.tpl
templates/de/html/admin/admin_list_rallyes.tpl
templates/de/html/admin/admin_list_refbanner.tpl
templates/de/html/admin/admin_list_sponsor_pay.tpl
templates/de/html/admin/admin_list_task.tpl
templates/de/html/admin/admin_overview_table.tpl

index a0e7674c33df6f9e5e02a5c50543c079750a19ee..0230b49198786a9354e67122013595379e3cf789 100644 (file)
@@ -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
index 1c303ffead258899673448817e9bfdd85bf5e01a..e75e4b1000dc5b3f698144597192f49060f2d60a 100644 (file)
@@ -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?
 ./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
 ./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
index da0d825554949a86bcecf9cdb40377c7c318dfda..1b9114732b40a2413b3c1d92d549ad389f9b3cf6 100644 (file)
@@ -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&uuml;r Bonus-Mails hinzugef&uuml;gt.");
+                               break;
                } // END - switch
                break;
 
index 0ec69f0fb318f4701ebf997779aaae6aa08a2245..22a2d5231f7782f184568dcb4de50056d1c7aedd 100644 (file)
@@ -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
index 34ee4408088f4b53a315aaec6fb6d24aebb631fb..d4cf091b80c56faf4df7fa4a1b26906a9400160b 100644 (file)
@@ -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]
 ?>
index ae2bc37ccd762365e36138c8cb5833061c7e71f1..c6c27638b724cf956058d515ee9eff3dbf63457b 100644 (file)
@@ -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]
 ?>
index e89e002839a54f77ac04fb0550b511aaa2f3d334..6c44c5f1ca1ddb892f32356d4f6ec55cbb4eec8c 100644 (file)
@@ -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:<br />'.__FUNCTION__.':<br />content=<pre>'.print_r($content, true).'</pre>');
+
+                       // 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));
index d6b0feb8a71011068c4a50adbf39709577e43b27..f089173e2f47111e0ab568b92a9a66fd37e54076 100644 (file)
@@ -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&ouml;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&uuml;ssen, wenn Sie es &auml;ndern wollen. Wollen Sie nur die Daten &auml;ndern, brauchen Sie kein Passwort eingeben.",
-       'ADMIN_ADMINS_DELETE_ACCOUNTS' => "Wollen Sie wirklich diese Accounts l&ouml;schen?",
+       'ADMIN_ADMINS_DELETE_ACCOUNTS_TITLE' => "Wollen Sie wirklich diese Accounts l&ouml;schen?",
        'ADMIN_ADMINS_CANNOT_DELETE_LAST' => "Das letzte Admin-Account kann nicht gel&ouml;scht werden.",
        'ADMIN_ADMINS_SELECT_ADMIN' => "Bitte w&auml;hlen Sie einen Administrator aus dem Men&uuml;punkt <em>Admin-Account &auml;ndern</em> aus.",
        'ADMIN_ADMINS_ADMIN_ID' => "Admin-Id",
@@ -82,10 +80,8 @@ addMessages(array(
        'ADMIN_ADMINS_ACL_ALREADY_ADDED' => "Zugriffskontrollzeile bereits hinzugef&uuml;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&ouml;schen",
        'ADMIN_ADMINS_LOGIN_ID' => "Admin-Login",
-       'ADMIN_ADMINS_EDIT_ACLS' => "Zugriffkontrollzeilen &auml;ndern",
+       'ADMIN_ADMINS_EDIT_ACLS_TITLE' => "Zugriffkontrollzeilen &auml;ndern",
        'ADMIN_ADMINS_DELETE_ACLS' => "Zugriffkontrollzeilen l&ouml;schen",
        'ADMIN_ADMINS_CHANGE_ACLS_SUBMIT' => "Eintr&auml;ge &auml;ndern",
        'ADMIN_ADMINS_REMOVE_ACLS_SUBMIT' => "Eintr&auml;ge l&ouml;schen",
index 78fc3ede9104980b340afd290d6a5cd850d49117..27fcdab34e2bc1c205301eef0306f630cec2b5ca 100644 (file)
@@ -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&uuml;tung erhalten.",
        'BONUS_RANK' => "Platz",
-       'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine &Uuml;bersicht, wer alles <strong>{?POINTS?}</strong> f&uuml;r die Mail <span class=\"data\">%s</span> 
-       erhalten hat",
+       'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine &Uuml;bersicht, wer alles <strong>{?POINTS?}</strong> f&uuml;r die Mail <span class=\"data\">%s</span> erhalten hat",
        'MEMBER_BONUS_SHOW_YOU_HAVE_CONFIRMED' => "Sie haben diese Mail am",
        'MEMBER_BONUS_SHOW_CONFIRMED_BONUS_IS' => "Stelle best&auml;tigt. Ihre Zusatz-Gutschrift f&uuml;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 <span class=\"data\">%s</span>:",
+       'ADMIN_EDIT_BONUS_EMAIL_TITLE' => "Daten der Bonus-Mail Nr. <span class=\"data\">%s</span> &auml;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&auml;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&auml;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 <span class=\"data\">%s</span>:",
 
-// 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&ouml;schen",
 ));
 
 // [EOF]
index 51adea1f6ea54e5163beb5edc2a91052d44bb3be..832fdcac514a5640d074b7a24b9730aaabfceb52 100644 (file)
@@ -185,8 +185,6 @@ addMessages(array(
        'ADMIN_EDIT_DELETE_MAX_VALUES_TITLE' => "Maximal-Werte bearbeiten / l&ouml;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&ouml;schen",
        'NO_MAX_VALUES' => "Derzeit klappt die Anmeldung nicht, da Sie keine maximal zu empfangenen Mails einstellen k&ouml;nnen.",
        'MAX_PER_DAY' => "Maximale Mitgliedermails/Tag",
        'PER_DAY' => "Mails",
@@ -335,8 +333,6 @@ addMessages(array(
        'ADMIN_PAYMENT_PAYMENT' => "Verg&uuml;tete {?POINTS?}",
        'ADMIN_PAYMENT_PRICE' => "{?POINTS?}-Kosten",
        'ADMIN_PAYMENT_TITLE' => "Mailname",
-       'ADMIN_EDIT_PAYMENT' => "Editeren",
-       'ADMIN_DELETE_PAYMENT' => "L&ouml;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&auml;lt Ihre Webseite einen Frame-Killer.",
        'ADMIN_SELECT_EMAIL_EDIT' => "Email ausw&auml;hlen, um diese zu editieren",
        'RESET_SELECT' => "Auswahl zur&uuml;cknehmen",
-       'ADMIN_EDIT_EMAIL' => "Mailbuchung bearbeiten",
        'ADMIN_CHANGE_EMAIL' => "&Auml;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 &auml;ndern",
        'ADMIN_REFERAL_DEPTHS_ID' => "Ref-Level id",
        'ADMIN_CHANGE_REF' => "&Auml;ndern",
-       'ADMIN_REMOVE_REF' => "L&ouml;schen",
        'ADMIN_REFERAL_DEPTHS_SAVED' => "Referal-Ebenen gespeichert...",
        'ADMIN_REFERAL_DEPTHS_DELETED' => "Referal-Ebenen gel&ouml;scht...",
        'ADMIN_EDIT_PAYMENT_TITLE' => "Mailverg&uuml;tungen editieren",
@@ -620,7 +614,7 @@ addMessages(array(
        'ADMIN_UNKNOWN_TASK_TYPE' => "Unbekannter Aufgabentyp <span class=\"data\">%s</span> f&uuml;r Aufgabe <span class=\"data\">%s</span> erkannt.",
        'ADMIN_TASK_SYSTEM_WELCOME' => "Task-Management Ihres {?mt_word2?}",
        'ADMIN_UNSELECT_ALL' => "Alles abw&auml;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 <span class=\"data\">%s</span> Erweiterungen ge&auml;ndert.",
        'ADMIN_EXTENSION_EDITED' => "Es wurden <span class=\"data\">%s</span> Erweiterungen editiert.",
        'ADMIN_EXTENSION_REGISTER_NEXT_LINK' => "Weiter zur Task-&Uuml;bersicht...",
-       'ADMIN_DELETE_ENTRIES' => "L&ouml;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&auml;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. <span class=\"data\">%s</span> bearbeiten",
        'ADMIN_DELETE_PAYMENT_TITLE' => "Mailverg&uuml;tungen l&ouml;schen",
        'ADMIN_CONFIG_REFERAL_PAYOUT' => "Wie viele Mails m&uuml;ssen die Mitglieder mindestens best&auml;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&auml;ufigsten angeklickten Men&uuml;s",
        'GUEST_TOP_GUEST_STATS' => "Gastmen&uuml;",
        'GUEST_TOP_MEMBER_STATS' => "Mitgliedmen&uuml;",
-       'ADMIN_DELETE_REFERAL_BANNER' => "L&ouml;schen",
-       'ADMIN_EDIT_REFERAL_BANNER' => "Editieren",
        'ADMIN_EDIT_REFERAL_BANNER_URL' => "Banner-URL &auml;ndern",
        'ADMIN_EDIT_REFERAL_BANNER_ALTERNATIVE_TEXT' => "Alternativen Text &auml;ndern",
        'ADMIN_EDIT_POINT_SETTINGS' => "EInstellungen an den {?POINTS?}verg&uuml;tungen",
@@ -895,7 +887,6 @@ addMessages(array(
        'ADMIN_LIST_REFERALS' => "Referal-&Uuml;bersicht des Mitgliedes <span class=\"data\">%s</span> in allen Ebenen:",
        'ADMIN_LIST_REFERALS_LEVEL' => "Referals in Ebene <span class=\"data\">%s</span>:",
        'ADMIN_LIST_REFERALS_NOTE' => "<strong>&Auml;nderung:</strong> 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&ouml;schen",
        'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gel&ouml;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&uuml;tzer Mail-Typ <span class=\"data\">%s</span> erkannt. Bitte melden Sie dies im Support-Forum.",
+       'ADMIN_EDIT_EMAIL_FAILED' => "&Auml;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 &Auml;nderungen an der Mail vorgenommen. Maildaten wurden NICHT ge&auml;ndert.",
 
        'MEMBER_MAIL_BONUS_CONFIRMED_ON' => "Sie haben diese Bonusmail <span class=\"data\">%s</span> best&auml;tigt.",
        'MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN' => "Es konnte nicht festgestellt werden, wann Sie die Bonus-Mail <span class=\"data\">%s</span> best&auml;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&uuml;tzer Mail-Typ <span class=\"data\">%s</span> 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 <span class=\"data\">%s</span nicht gefunden.",
+
+       // Admin actions - submit buttons
+       'ADMIN_ACTION_EDIT_SUBMIT' => "Bearbeiten",
+       'ADMIN_ACTION_CHANGE_SUBMIT' => "Editierungen ausf&uuml;hren",
+       'ADMIN_ACTION_DELETE_SUBMIT' => "L&ouml;schen",
+       'ADMIN_ACTION_REMOVE_SUBMIT' => "Eintr&auml;ge l&ouml;schen",
+
+       // Admin 'pool' mail actions
+       'ADMIN_EDIT_POOL_MAIL_LINK' => "Klick-Mail bearbeiten",
+       'ADMIN_DELETE_POOL_MAIL_LINK' => "Klick-Mail l&ouml;schen",
 ));
 
 // Description of all months
index c0331ecadcca0531fef692fa431646d9854aa14d..86122cafe9d8b2ed0c8ba2b9c310971bde3d9464 100644 (file)
@@ -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 &auml;ndern",
-       'ADMIN_NETWORK_DELETE' => "L&ouml;schen",
        'ADMIN_NETWORK_REMOVE' => "Daten entfernen",
        'ADMIN_NETWORK_CHOOSE' => "Werbenetzwerk ausw&auml;hlen",
        'ADMIN_NETWORK_TYPE_CHOOSE' => "Werbeart-Handler ausw&auml;hlen",
        'ADMIN_NETWORK_TYPES_ADD' => "Werbeart hinzuf&uuml;gen",
-       'ADMIN_NETWORK_TYPES_EDIT' => "Editieren",
-       'ADMIN_NETWORK_TYPES_DELETE' => "L&ouml;schen",
        'ADMIN_NETWORK_TYPES_CHANGE' => "Handler &auml;ndern",
        'ADMIN_NETWORK_TYPES_REMOVE' => "Handler entfernen",
        'ADMIN_NETWORK_REQUEST_PARAMETER_ADD' => "API-Parameter hinzuf&uuml;gen",
-       'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT' => "Editieren",
-       'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE' => "L&ouml;schen",
        'ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE' => "API-Parameter &auml;ndern",
        'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE' => "API-Parameter entfernen",
        'ADMIN_NETWORK_API_TRANSLATION_ADD' => "API-Arrayelement hinzuf&uuml;gen",
-       'ADMIN_NETWORK_API_TRANSLATION_EDIT' => "Editieren",
-       'ADMIN_NETWORK_API_TRANSLATION_DELETE' => "L&ouml;schen",
        // - Success titles
        'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt",
        'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt",
index dd95305f7bf2b41f046976e024df0785a1db7944..961cf08b4b80bba9c999cf2807520b96d7c04489 100644 (file)
@@ -56,8 +56,6 @@ addMessages(array(
        'ADMIN_PAYOUT_EDIT_DELETE_TITLE' => "Editieren / L&ouml;schen von Auszahlungstypen",
        'ADMIN_PAYOUT_EDIT_TITLE' => "Ausgw&auml;hlte Eintr&auml;ge editieren",
        'ADMIN_PAYOUT_DELETE_TITLE' => "Ausgw&auml;hlte Eintr&auml;ge l&ouml;schen",
-       'ADMIN_PAYOUT_EDIT' => "Editieren",
-       'ADMIN_PAYOUT_DELETE' => "L&ouml;schen",
        'ADMIN_PAYOUT_NO_MEMBER_REQUESTS' => "Keine Auszahlungsanfragen von Ihren Mitgliedern erhalten.",
        'ADMIN_PAYOUT_ENTRIES_CHANGED' => "Eintr&auml;ge wurden ge&auml;ndert.",
        'ADMIN_PAYOUT_ENTRIES_DELETED' => "Eintr&auml;ge wurden gel&oumllscht.",
index cb09da98cd4712c9a660cc64993e40e4467048af..f85446e806438c2a12cfcebc1dd9df2129520bd1 100644 (file)
@@ -68,16 +68,12 @@ addMessages(array(
        'RALLYE_LEVEL' => "Platz",
        'RALLYE_PRICE_INFO' => "Infos",
        'RALLYE_EDIT_SELECTED_PRICES' => "Preise/Pl&auml;tze &auml;ndern",
-       'RALLYE_EDIT_PRICES' => "Editieren",
-       'RALLYE_DELETE_PRICES' => "L&ouml;schen",
        'RALLYE_CHANGE_PRICES' => "&Auml;ndern",
        'RALLYE_ID' => "Rallye-Id",
        'RALLYE_EDIT_DELETE_RALLYES' => "&Auml;ndern / L&ouml;schen von Referal-Rallyes (Grunddaten)",
        'RALLYE_ADMIN_ID' => "Admin-Login",
        'RALLYE_TSTART' => "Anfang",
        'RALLYE_TEND' => "Ende",
-       'RALLYE_EDIT_ADMIN' => "Editieren",
-       'RALLYE_DELETE_ADMIN' => "L&ouml;schen",
        'RALLYE_EDIT_DELETE_NOTE' => "Wenn Sie die Grunddaten der ausgew&auml;hlten Referal-Rallyes &auml;ndern / l&ouml;schen wollen, markieren Sie diese per K&auml;stchen. Wollen Sie die Preise &auml;ndern, klicken Sie den Referal-Rallye-Titel an. Aktive Referal-Rallyes k&ouml;nnen nicht ge&auml;ndert werden, sondern m&uuml;ssen erst deaktiviert werden.",
        'ADMIN_RALLYE_PRICES_NOTE' => "Wenn Sie die Referal-Rallye-Preise hinzuf&uuml;gen, &auml;ndern oder l&ouml;schen wollen, klicken Sie einfach den Referal-Rallye-Titel an.",
        'RALLYE_ENTRIES_DELETED' => "Eintr&auml;ge gel&ouml;scht.",
index 19b3a8c1194372e78061e819a82922564a2d0897..771283855647042778a4aee94bdeeb324df22364 100644 (file)
@@ -155,8 +155,6 @@ addMessages(array(
        'ADMIN_SPONSOR_PAYTYPE_ADDED' => "Buchungspaket <span class=\"data\">%s</span> hinzugef&uuml;gt.",
        'SPONSOR_LIST_PAYMENT_TYPES_TITLE' => "Buchungspakete auflisten, bearbeiten und l&ouml;schen",
        'SPONSOR_PAYTYPE_MIN_COUNT2' => "Minimum",
-       'ADMIN_SPONSOR_PAYTYPE_EDIT' => "Bearbeiten",
-       'ADMIN_SPONSOR_PAYTYPE_DELETE' => "L&ouml;schen",
        'SPONSOR_EDIT_PAY_ENTRIES' => "Buchungspakete editieren",
        'SPONSOR_DELETE_PAY_ENTRIES' => "Buchungspakete l&ouml;schen",
        'SPONSOR_PAY_ENTRIES_CHANGED' => "Buchungspakete ge&auml;ndert.",
index c7cdba8f882a11a38518bdc2ce42499e2830ec20..2d70481046b615534a35aab7fd0277f83cd91d8c 100644 (file)
@@ -50,10 +50,10 @@ addMessages(array(
        'ADMIN_USER_ACCOUNT_NOT_SAVED' => "Mitgliedsaccount <u>nicht</u> gespeichert.",
        'ADMIN_USER_ACCOUNT_LOCKED' => "Mitgliedsaccount <span class=\"data\">%s</span> wurde gesperrt.",
        'ADMIN_USER_ACCOUNT_UNLOCKED' => "Mitgliedsaccount <span class=\"data\">%s</span> wurde freigegeben.",
-       'ADMIN_USER_ACTION_LINK_DELETE_USER' => "L&ouml;schen",
-       'ADMIN_USER_ACTION_LINK_EDIT_USER' => "&Auml;ndern",
-       'ADMIN_USER_ACTION_LINK_LOCK_USER' => "Sperren",
-       'ADMIN_USER_ACTION_LINK_UNLOCK_USER' => "Entsperren",
+       'ADMIN_USER_ACTION_LINK_DELETE_USER' => "Mitgliedsdaten l&ouml;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&ouml;schen (mit Abfrage)",
index cf78ba0e33834bb5cceaaf7ab2f47509d326aca6..2c8568c37c1b35f6103f489cc55f85e9f9463fcc 100644 (file)
@@ -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 = '<span class="notice">{--SETTINGS_NOT_SAVED--}</span>';
+                       $content = '<span class="notice">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
                }
+       } 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 = '<span class="notice">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
+               }
        } else {
+               // No valid action
+               $content = '<span class="notice">{--ADMIN_EDIT_EMAIL_FAILED--}</span>';
+       }
+
+       // 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]
index eeba4db76cad0d6327f1c39de93eae5f23938e0b..da8d1670664a420a0d763d7f86142099516fde5c 100644 (file)
@@ -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);
 }
index 085d394043704d59ef60587f774a2ee2370bfc08..5b840ebc4e30bf8b15bfe0936cbe84c84b9fa606 100644 (file)
@@ -16,8 +16,8 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_PAYOUT_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_PAYOUT_DELETE--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index d6d5dd9fce1280dee8151c326b1572d32f1df633..a241a0b8ed195b2bcfbb592506aeb0ee21650bf8 100644 (file)
@@ -24,8 +24,8 @@
        <tr>
                <td colspan="4" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--RALLYE_EDIT_PRICES--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--RALLYE_DELETE_PRICES--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 2d34699469584beab6cd6bbf9cfab29484ab0d1f..acfc571de5bf8ba12f5bafd90e458a01bee3b258 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_ADMINS_DELETE_ACCOUNTS--}</strong>
+                       <strong>{--ADMIN_ADMINS_DELETE_ACCOUNTS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_ADMINS_DELETE--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index cd24a6afc999340f3c734943e0be922e98d0f985..f0ccca99382165a2eb8e45c63612dc78d9a9f72f 100644 (file)
@@ -10,7 +10,7 @@
        <tr>
                <td align="center" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="ok" class="form_delete" value="{--ADMIN_REMOVE_REF--}" />
+                       <input type="submit" name="ok" class="form_delete" value="{--ADMIN_ACTION_REMOVE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 4e8734ed91c4d7ff7eb3a878bc60814feda785ed..bf28ead797678bedd71d89a40a45c6603f46d9a3 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="6" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_ADMINS_EDIT_ACCOUNTS--}</strong>
+                       <strong>{--ADMIN_ADMINS_EDIT_ACCOUNTS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="6" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_ADMINS_EDIT--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 124a53116cc6fb5bb02e8be9438720e5e05d742d..c3f55f54f71a360e4f087d0628bb3c2b03beebc9 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_ADMINS_EDIT_ACLS--}:</strong>
+                       <strong>{--ADMIN_ADMINS_EDIT_ACLS_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
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 (file)
index 0000000..4f6f0e3
--- /dev/null
@@ -0,0 +1,42 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_emails%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td align="center" colspan="2" class="table_header bottom">
+                       <strong>{%message,ADMIN_EDIT_BONUS_EMAIL_TITLE=$content[id]%}:</strong>
+               </td>
+       </tr>
+       <tr>
+               <td align="right">
+                       {--ADMIN_EDIT_URL--}:
+               </td>
+               <td>
+                       <input type="text" class="form_field" name="url" size="30" maxlength="255" value="$content[url]" />
+               </td>
+       </tr>
+       <tr>
+               <td align="right">
+                       {--ADMIN_EDIT_EMAIL_SUBJECT--}:
+               </td>
+               <td>
+                       <input type="text" class="form_field" name="subject" size="30" maxlength="255" value="$content[subject]" />
+               </td>
+       </tr>
+       <tr>
+               <td align="right" class="bottom">
+                       {--ADMIN_EDIT_EMAIL_TEXT--}:
+               </td>
+               <td class="bottom">
+                       <textarea name="text" class="form_field" rows="8" cols="28">$content[text]</textarea>
+               </td>
+       </tr>
+       <tr>
+               <td align="center" colspan="2" class="table_footer">
+                       <input type="hidden" name="bid" value="$content[id]"/ >
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="save" class="form_submit" value="{--ADMIN_ACTION_CHANGE_SUBMIT--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
index 7cc9b7b42922769d8eb96681dde4791b290d20d4..bac4013681636574f3c0ada8d3bd66261adb1a43 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_EMAIL--}:</strong> ($content[id])
+                       <strong>{%message,ADMIN_EDIT_EMAIL_TITLE=$content[id]%}:</strong>
                </td>
        </tr>
        <tr>
                <td align="right">
-                       <strong>{--ADMIN_EDIT_URL--}:</strong>
+                       {--ADMIN_EDIT_URL--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="url" size="30" maxlength="255" value="$content[url]" />
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td align="right">
-                       <strong>{--ADMIN_EDIT_EMAIL_SUBJECT--}:</strong>
+                       {--ADMIN_EDIT_EMAIL_SUBJECT--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="subject" size="30" maxlength="255" value="$content[subject]" />
@@ -24,7 +24,7 @@
        </tr>
        <tr>
                <td align="right" class="bottom">
-                       <strong>{--ADMIN_EDIT_EMAIL_TEXT--}:</strong>
+                       {--ADMIN_EDIT_EMAIL_TEXT--}:
                </td>
                <td class="bottom">
                        <textarea name="text" class="form_field" rows="8" cols="28">$content[text]</textarea>
@@ -32,7 +32,7 @@
        </tr>
        <tr>
                <td align="center" colspan="2" class="table_footer">
-                       <input type="hidden" name="id" value="$content[id]"/ >
+                       <input type="hidden" name="mid" value="$content[id]"/ >
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="save" class="form_submit" value="{--ADMIN_CHANGE_EMAIL--}" />
                </td>
index caf648970b9b23e9a7d290d0c6db9fb1ba032b3c..692f8c4ac90595b2ada1bf24a4ad872e89f4f452 100644 (file)
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_PAYOUT_EDIT--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
                </td>
        </tr>
 </table>
index a53fd2020c8ed8a8edf990e6392a5be3ea7c06df..4df09f4cc267bea1d1c14ef2cb00eb80963dd13d 100644 (file)
@@ -10,7 +10,7 @@
        <tr>
                <td class="table_footer" colspan="2">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--ADMIN_EDIT_REFERAL_BANNER--}" />
+                       <input type="submit" class="form_submit" name="ok" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 6a6182e69cbb4c57d654454feeac2af68d7476e8..1fee67237385bfa6ee43709e5540306dcef6fdae 100644 (file)
@@ -14,7 +14,7 @@
                <td colspan="6" class="table_footer">
                        <input type="reset" class="form_reset" value="{--RESET_SELECT--}" />
                        <input type="submit" name="status" class="form_submit" value="{--ADMIN_CHANGE_STATUS_THEME--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_ENTRIES--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 53a34a13ffffa3f81d61939333b1645257b8859c..97928a7b59a78c2877ad74e85b102d47b8b33f28 100644 (file)
@@ -64,6 +64,6 @@
 </tr>
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom admin_delete_link" colspan="3">
-               <a href="{%url=modules.php?module=admin&amp;what=del_email&amp;mid=$content[id]%}">{--ADMIN_DELETE_NORMAL_MAIL--}</a>
+               {%template,AdminMemberMailLinks=$content[id]%}
        </td>
 </tr>
index 62691347eb2c2f02c87f58ad6bbb7a94c1e0ea17..d66493459d53dc2606c048cc1962ba4ca8133b10 100644 (file)
@@ -19,7 +19,7 @@
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                        <input type="submit" class="form_submit" name="change" value="{--ADMIN_DE_ACTIVATE--}" />
                        <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_ENTRIES--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
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 (file)
index 0000000..bac470d
--- /dev/null
@@ -0,0 +1,10 @@
+<div align="center">
+       <div>
+               <strong>{%message,ADMIN_LINKS_BONUS_MAIL_TITLE=$content[id]%}</strong>
+       </div>
+       <div>
+               [<a
+                href="{%url=modules.php?module=admin&amp;what=edit_emails&amp;bid=$content[id]%}">{--ADMIN_EDIT_BONUS_MAIL_LINK--}</a>|<a
+                href="{%url=modules.php?module=admin&amp;what=del_email&amp;bid=$content[id]%}">{--ADMIN_DELETE_BONUS_MAIL_LINK--}</a>]
+       </div>
+</div>
index 03b8bef095aa219438042f54f1ff5f1394278f74..6f56700cf8ab12e6fcc6d256998634141a7c8be8 100644 (file)
@@ -18,7 +18,7 @@
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                        <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ADMINS_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ADMINS_DELETE--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index a7533695ec38300a391b29e79a934a6ca6d49ed5..893e55a63c23a9667e2fa90b6eac08a75e5987dd 100644 (file)
@@ -17,8 +17,8 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ADMINS_EDIT_ACLS_SUBMIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ADMINS_DELETE_ACLS_SUBMIT--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 2d7c7169593c58acb3b6934632043066a22c086e..29aef880567bae27f3046b6738861e81f2174376 100644 (file)
@@ -21,7 +21,7 @@
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                        <input type="submit" class="form_submit" name="change" value="{--ADMIN_DE_ACTIVATE--}" />
                        <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_ENTRIES--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index d364abcecd682728eedf8b6bd755707b7af301ac..52843f88d5aa31b0add63697cfe6db57eed49ee3 100644 (file)
                <strong>---</strong>
        </td>
 </tr>
-<tr>
-       <td align="center" class="top table_header" colspan="3">
-               {--ADMIN_LIST_BONUS_EMAILS_ADMIN_LINKS--}
-       </td>
-</tr>
 <tr>
        <td align="center" class="top admin_delete_link" colspan="3">
                {%template,AdminBonusMailLinks=$content[id]%}
index a0d570f95a85cd4ab6d5012310c9bd7b7c234019..ff02f1d2b5567b14fe529c9f31cb49fdfd9d9d5b 100644 (file)
@@ -18,7 +18,7 @@
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                        <input type="submit" class="form_submit" name="change" value="{--ADMIN_DE_ACTIVATE--}" />
                        <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_ENTRIES--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index e40f513c10eca1510661150276aa3a4d3bc03d14..eebd37c46363c4d9365d8141c67efdb73929c2bd 100644 (file)
@@ -15,8 +15,8 @@
        <tr>
                <td align="center" colspan="3" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT_MAX_VALUE--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_MAX_VALUE--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 306de892c31850a2f5aa2c7d2431c6a61987dce2..ea3fc2007f40ca7015f871d6cafad90bf13e8090 100644 (file)
@@ -16,7 +16,7 @@
                <td colspan="3" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                        <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_ENTRIES--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 2c428442cf3f8f09ee48a48d0c7511de40e7161a..0e41203dd9ccf8ae5eb5cefb7af0526e797fe55d 100644 (file)
@@ -21,8 +21,8 @@
        <tr>
                <td colspan="6" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_NETWORK_API_TRANSLATION_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_NETWORK_API_TRANSLATION_DELETE--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 325a42948e0bbd48faf91a12384a6e69a116db18..3e016e2cad797137ec6c64486008377a10ada740 100644 (file)
@@ -22,8 +22,8 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_DELETE--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 056242ec71f515aae29a47518dd815fd73335dc6..2fe523e44b0e833b1cc6c2e0071418cceb3b92f4 100644 (file)
@@ -22,8 +22,8 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_NETWORK_TYPES_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_NETWORK_TYPES_DELETE--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index bc82733d4aa681e255d4c1885535884394601dd3..4480b4378b60ee5b3529e18bd630e3b8336700bc 100644 (file)
@@ -22,8 +22,8 @@
        <tr>
                <td colspan="8" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_NETWORK_EDIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_NETWORK_DELETE--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index f9a7a89d3dece8fb4bb23abddf78af0b4e2d0b1c..e8e12ba44009d8fbe133e0a7565d2a23a3472268 100644 (file)
@@ -17,8 +17,8 @@
        <tr>
                <td class="table_footer" colspan="5">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT_PAYMENT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_PAYMENT--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 0abf15db757eb46e5ecb3e337eada509042fd9d1..55889ec705ff37fc455cfebfcb8524b945e2189d 100644 (file)
@@ -13,8 +13,8 @@
        <tr>
                <td colspan="6" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--RALLYE_EDIT_ADMIN--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--RALLYE_DELETE_ADMIN--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 7498d4fb61fffb754e4e8ac9d6896cacff2e69b2..73945196bd04c0caae237f4d412f9a324847bb21 100644 (file)
@@ -18,8 +18,8 @@
        <tr>
                <td class="table_footer" colspan="6">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT_REFERAL_BANNER--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_REFERAL_BANNER--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 7d8523efc2f86352cb0a0ba71c76e8858b71b75e..c1658963fff8ef338823bc36dbce4e4c63f40be8 100644 (file)
@@ -17,8 +17,8 @@ $content
 <tr>
        <td colspan="5" class="table_footer">
                <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-               <input type="submit" class="form_submit" name="edit" value="{--ADMIN_SPONSOR_PAYTYPE_EDIT--}" />
-               <input type="submit" class="form_delete" name="delete" value="{--ADMIN_SPONSOR_PAYTYPE_DELETE--}" />
+               <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
+               <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
        </td>
 </tr>
 </table>
index 4ec5340251a73234f73c960beffe78e4408cebfb..d180e3baa0425e8c24e024e5eecea85f39c1a0c3 100644 (file)
@@ -22,7 +22,7 @@ $content[rows]
                <input type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}" class="form_submit" />
                <input type="submit" name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}" class="form_submit" />
                <input type="submit" name="redir" value="{--ADMIN_REDIRECT_TASKS--}" class="form_submit" />
-               <input type="submit" name="delete" value="{--ADMIN_DELETE_ENTRIES--}" class="form_delete" />
+               <input type="submit" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" class="form_delete" />
        </td>
 </tr>
 </table>
index f4a3297a5dc1310293a7fe4276f1306e677ac9cc..8bdd8ebb4d228bf0d6d859a5a4e9a4b660579d81 100644 (file)
@@ -22,7 +22,7 @@ $content
                <input type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}" class="form_submit" />
                <input type="submit" name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}" class="form_submit" />
                <input type="submit" name="redir" value="{--ADMIN_REDIRECT_TASKS--}" class="form_submit" />
-               <input type="submit" name="delete" value="{--ADMIN_DELETE_ENTRIES--}" class="form_delete" />
+               <input type="submit" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" class="form_delete" />
        </td>
 </tr>
 </table>