Extension ext-grade continued, a lot renames:

- All 'remove' renamed to 'do_delete'
- A lot 'change' renamed to 'do_edit', both renames will become important for
  the next full refacturing of all (list|edit|delete)_foo formulars to the XML
  based system
- Extension ext-grade continued, only a function-less script has been added
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index b928345c9a34e35b318839cb5a4376d357946d11..5000e2d9d759cb68211f7dc33f9c537041d09316 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -520,6 +520,7 @@ inc/modules/admin/what-list_network_types.php svneol=native#text/plain
 inc/modules/admin/what-list_networks.php svneol=native#text/plain
 inc/modules/admin/what-list_notifications.php svneol=native#text/plain
 inc/modules/admin/what-list_payouts.php svneol=native#text/plain
+inc/modules/admin/what-list_point_accounts.php svneol=native#text/plain
 inc/modules/admin/what-list_primera.php svneol=native#text/plain
 inc/modules/admin/what-list_rallyes.php svneol=native#text/plain
 inc/modules/admin/what-list_refs.php svneol=native#text/plain

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index f4ede999e5cfddff1ae1b8677b3404984e3c89b2..55b9d06a2e4ed7f90d00c7961cc6930f25840949 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -167,7 +167,7 @@
 ./inc/modules/member/what-bonus.php:55:        // @TODO Rewrite this to a filter
 ./inc/modules/member/what-categories.php:131:          // @TODO Rewrite this to use $OUT .= ...
 ./inc/modules/member/what-logout.php:17: * @TODO Rewrite the code to a filter                                   *
-./inc/modules/member/what-order.php:427:                       // @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:488:                       // @TODO Rewrite this to a filter
 ./inc/modules/member/what-order.php:85:                // @TODO Rewrite this to SQL_FETCHARRAY()
 ./inc/modules/member/what-payout.php:194:                                      // @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter?

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 326c48b3dc1aff46e8a4fc96bf3aae042acfc9f7..a8ccb8aad838e883e3975627108d6b7d04efb267 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -53,7 +53,7 @@ function getCurrentNetworkId () {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
        // Was the form sent?
-       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('change')) || (isFormSent('remove'))) {
+       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('do_edit')) || (isFormSent('do_delete'))) {
                // Do we have a 'do'?
                if (isGetRequestParameterSet('do')) {
                        // Process the request
@@ -68,7 +68,7 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
        // Form really sent?
-       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('delete')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
+       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('delete')) && (!isFormSent('do_edit')) && (!isFormSent('do_delete'))) {
                // Abort here
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
                return;

diff --git a/inc/libs/order_functions.php b/inc/libs/order_functions.php
index ef7549cf848bb52a34fe0232f7fa8d59ee9580a7..7a6fb06c427edbe3caef30c39d84d68b88bb3d73 100644 (file)
--- a/inc/libs/order_functions.php
+++ b/inc/libs/order_functions.php
@@ -48,7 +48,9 @@ function addOrderSelectionOptions ($default) {
        foreach ($LIST as $item) {
                // Defaul selection
                $selected = '';
-               if ($item == $default) $selected = ' selected="selected"';
+               if ($item == $default) {
+                       $selected = ' selected="selected"';
+               } // END - if
 
                // 'ref_clicks' needs to be rewritten to 'referal_clicks'
                if ($item == 'ref_clicks') {
@@ -63,5 +65,33 @@ function addOrderSelectionOptions ($default) {
        return $OUT;
 }
 
+// ----------------------------------------------------------------------------
+//                Wrapper functions for configuration entries
+// ----------------------------------------------------------------------------
+
+// Getter for 'order_multi_page' config entry
+function getOrderMultiPage () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('order_multi_page');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Determines wether 'order_multi_page' is set to 'Y'
+function isOrderMultiPageEnabled () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = (getOrderMultiPage() == 'Y');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>

diff --git a/inc/modules/admin/what-admins_edit.php b/inc/modules/admin/what-admins_edit.php
index eb06ab2e8a5b80baf1ff29e8a84753e40d1a2a85..cc6320ec7019fd706ebc1e7559fb0cbbcfaf636a 100644 (file)
--- a/inc/modules/admin/what-admins_edit.php
+++ b/inc/modules/admin/what-admins_edit.php
@@ -44,7 +44,9 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Set selection data to empty array when it is empty
-if (!isPostRequestParameterSet('sel')) setPostRequestParameter('sel', array());
+if (!isPostRequestParameterSet('sel')) {
+       setPostRequestParameter('sel', array());
+} // END - if
 
 // Check if direct admin account was selected
 if (isGetRequestParameterSet('admin')) {
@@ -59,14 +61,14 @@ if (isGetRequestParameterSet('admin')) {
 if ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit account(s)
        adminsEditAdminAccount(postRequestArray());
-} elseif ((isFormSent('change')) && (count(postRequestParameter('login')) > 0)) {
+} elseif ((isFormSent('do_edit')) && (count(postRequestParameter('login')) > 0)) {
        // Change admin accounts
        adminsChangeAdminAccount(postRequestArray());
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
        // Show admin accounts for deletetion
        adminsDeleteAdminAccount(postRequestArray());
 } else {
-       if ((isFormSent('remove')) && (ifPostContainsSelections())) {
+       if ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
                // Remove accounts now
                adminsRemoveAdminAccount(postRequestArray());
        } // END - if

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index f697968d7d488cf235c8e08bd51630d0edee1ff6..525e3882da4a1afa157b2a46dbea23f029befc21 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -118,7 +118,7 @@ ORDER BY
 
        if (!SQL_HASZERONUMS($result)) {
                // Shall I change entries?
-               if (isFormSent('change')) {
+               if (isFormSent('do_edit')) {
                        // Init SQLs
                        initSqls();
 
@@ -129,7 +129,7 @@ ORDER BY
                                $content['admin_id'] = bigintval($content['admin_id']);
 
                                // Update entry
-                               addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_mails` SET admin_id=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",
+                               addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_mails` SET `admin_id`=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",
                                        array($content['admin_id'], $id), __FILE__, __LINE__, false));
 
                                if (($content['admin_id'] < 1) && (isPostRequestParameterSet('template', $id))) {

diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index 354fa37f7cead5c527ae6078ab59b1d68659cfd9..eeb980ca5adaa02d4c1ae0420d2c37d38a18cce9 100644 (file)
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -80,9 +80,9 @@ if (isFormSent('edit')) {
 
                // Remove maybe confusing data
                unsetPostRequestParameter('edit');
-               unsetPostRequestParameter('change');
+               unsetPostRequestParameter('do_edit');
        }
-} elseif (isFormSent('change')) {
+} elseif (isFormSent('do_edit')) {
        // Init SQLs
        initSqls();
 

diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index 077bcb0f4493802aeb8993cb00a0c6762ebff29a..7aaee12902532dd47e173e53048f862d1708ecbf 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -109,7 +109,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 
        // Load main template
        loadTemplate('admin_edit_payouts', false, $OUT);
-} elseif ((isFormSent('change')) && (ifPostContainsSelections())) {
+} elseif ((isFormSent('do_edit')) && (ifPostContainsSelections())) {
        // Change them now
        // Init SQLs
        initSqls();
@@ -164,7 +164,7 @@ LIMIT 1",
 
        // Load main template
        loadTemplate('admin_delete_payouts', false, $OUT);
-} elseif ((isFormSent('remove')) && (ifPostContainsSelections())) {
+} elseif ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
        // Init SQLs
        initSqls();
 

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index fb49ad871153075ed47dcd7bed431e0a8a0ae17b..9b92287488d63e7995bc9d1c11cde10ecb4b9dd8 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -73,7 +73,7 @@ if (isGetRequestParameterSet('rallye')) {
                                displayMessage('{--RALLYE_PRICE_ALREADY_FOUND--}');
                        }
                }
-       } elseif (isFormSent('remove')) {
+       } elseif (isFormSent('do_delete')) {
                // Check if at last one line is selected
                if (ifPostContainsSelections()) {
                        // Delete selected entries
@@ -87,7 +87,7 @@ if (isGetRequestParameterSet('rallye')) {
                } else {
                        displayMessage('{--RALLYE_ENTRIES_NOT_DELETED--}');
                }
-       } elseif (isFormSent('change')) {
+       } elseif (isFormSent('do_edit')) {
                // Change entries
                foreach (postRequestParameter('level') as $id => $level) {
                        // Secure id

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index e7bdea2baf583e70682811cd2620cf9518f8233c..6774b62377cbb1937b1e06ec520561921d1b6c5f 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -217,7 +217,7 @@ if (isGetRequestParameterSet('reg_ext')) {
        // Load template
        loadTemplate('admin_extensions_delete', false, $OUT);
        $do = 'delete';
-} elseif ((isFormSent('remove')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
+} elseif ((isFormSent('do_delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Remove extensions from DB (you have to delete all files manually!)
        $cache_update = '0';
        foreach (postRequestParameter('sel') as $ext_id => $active) {

diff --git a/inc/modules/admin/what-list_admins_acls.php b/inc/modules/admin/what-list_admins_acls.php
index 8924be90af3d522368ddecd73e45bd932a885f61..f529023f735ecb5c7e03e5fc60d7a3e116309cc2 100644 (file)
--- a/inc/modules/admin/what-list_admins_acls.php
+++ b/inc/modules/admin/what-list_admins_acls.php
@@ -78,7 +78,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
 
        // Load main template
        loadTemplate('admin_edit_admins_acls', false, $OUT);
-} elseif ((isFormSent('change')) && (ifPostContainsSelections())) {
+} elseif ((isFormSent('do_edit')) && (ifPostContainsSelections())) {
        // Change entries
        foreach (postRequestParameter('sel') as $id => $selected) {
                // Secure id
@@ -131,7 +131,7 @@ LIMIT 1",
 
        // Load main template
        loadTemplate('admin_delete_admins_acls', false, $OUT);
-} elseif ((isFormSent('remove')) && (ifPostContainsSelections())) {
+} elseif ((isFormSent('do_delete')) && (ifPostContainsSelections())) {
        // Remove entries
        // @TODO Rewrite this to filter 'run_sqls'
        foreach (postRequestParameter('sel') as $id => $selected) {

diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php
index 1097f84ce57c8335efbffff395cf01a678300e59..bb2fa1fbb1d76aee1f895375d1abe16a6a7f8b18 100644 (file)
--- a/inc/modules/admin/what-list_bank_package.php
+++ b/inc/modules/admin/what-list_bank_package.php
@@ -143,7 +143,7 @@ if ((isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id')))
                        )
                );
                $show = false;
-       } elseif (isFormSent('remove')) {
+       } elseif (isFormSent('do_delete')) {
                // Delete entries (with confirmation)
                adminDeleteEntriesConfirm(
                        postRequestParameter('id'),

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 31692ad9c571baade2f8ae16a76381b5a960de73..39ed75b7605cef23e3343fc59866683b98e99993 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -69,7 +69,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
        // Display message
        displayMessage($message);
-} elseif ((isFormSent('change')) && (isPostRequestParameterSet('id'))) {
+} elseif ((isFormSent('do_edit')) && (isPostRequestParameterSet('id'))) {
        // Change all status
        adminChangeActivationStatus(postRequestParameter('id'), 'countries', 'is_active');
 
@@ -149,7 +149,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
                // Create message
                $message = '{--ADMIN_COUNTRIES_MODIFIED--}';
-       } elseif ((isFormSent('remove')) && (isPostRequestParameterSet('id'))) {
+       } elseif ((isFormSent('do_delete')) && (isPostRequestParameterSet('id'))) {
                // Remove
                $IDs = implode(',', array_keys(postRequestParameter('id')));
                addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestParameter('id'))."");

diff --git a/inc/modules/admin/what-list_point_accounts.php b/inc/modules/admin/what-list_point_accounts.php
new file mode 100644 (file)
index 0000000..1dc5942
--- /dev/null
+++ b/inc/modules/admin/what-list_point_accounts.php
@@ -0,0 +1,47 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 02/12/2004 *
+ * ===================                          Last change: 02/12/2004 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_point_accounts.php                     *
+ * -------------------------------------------------------------------- *
+ * Short description : Listing and management of point accounts         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Auflistung/Verwaltung von Punktekontos           *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+// [EOF]
+?>

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 88207882415018499c5e262a5bdb5f4aa48e2cb3..ec3c17b554ff59b586c2c74cdcd2b17904577389 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -100,7 +100,7 @@ if (isGetRequestParameterSet('rallye')) {
 
        // Run SQL command
        runFilterChain('run_sqls');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
        // Delete rallyes
        if (ifPostContainsSelections()) {
                // Init SQLs
@@ -126,7 +126,7 @@ if (isGetRequestParameterSet('rallye')) {
                // No rallye selected to delete!
                $message = '{--RALLYE_DELETE_NOTHING_SELECTED--}';
        }
-} elseif (isFormSent('change')) {
+} elseif (isFormSent('do_edit')) {
        // Change rallye
        if (ifPostContainsSelections('title')) {
                // Init SQLs

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index 7da0139c83cf770d3c34677c75241b71f071ad58..4efd831b63a6a777e5c8189299369eb4d698d254 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -55,15 +55,15 @@ if (isFormSent('add')) {
        if ((postRequestParameter('pay_min_count') == '0') || (!isPostRequestParameterSet('pay_min_count'))) unsetPostRequestParameter('add');
        if (!isPostRequestParameterSet('pay_currency')) unsetPostRequestParameter('add');
 
-} elseif ((isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('change')) || (isFormSent('remove'))) {
+} elseif ((isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('do_edit')) || (isFormSent('do_delete'))) {
        // Check if at least one entry was selected
        if (!isPostRequestParameterSet('id')) {
                // Nothing selected for editing / deleting???
                unsetPostRequestParameter('edit');
                unsetPostRequestParameter('delete');
-               unsetPostRequestParameter('change');
-               unsetPostRequestParameter('remove');
-       } elseif (isFormSent('change')) {
+               unsetPostRequestParameter('do_edit');
+               unsetPostRequestParameter('do_delete');
+       } elseif (isFormSent('do_edit')) {
                // Change entries here...
                foreach (postRequestParameter('id') as $id => $sel) {
                        // Secure id
@@ -91,7 +91,7 @@ LIMIT 1",
 
                // Generate message
                $message = '{--SPONSOR_PAY_ENTRIES_CHANGED--}';
-       } elseif (isFormSent('remove')) {
+       } elseif (isFormSent('do_delete')) {
                // Remove entries here...
                foreach (postRequestParameter('id') as $id => $sel) {
                        // Remove entry

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index d7e2c5244ff94a06e07fe9ff99ac51aae939aebe..44fa06128d91a19b74a7e6b35aa21adc60dfec6c 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -58,7 +58,7 @@ if (isFormSent()) {
 } elseif (isPostRequestParameterSet('sent')) {
        // Sent mail
        YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
        // Add mail to exclude list
        YOOMEDIA_EXCLUDE_MAIL(postRequestArray(), 'normal');
 } elseif (isPostRequestParameterSet('unlist')) {

diff --git a/inc/modules/member/what-cash_coupon.php b/inc/modules/member/what-cash_coupon.php
index da4e810d4b8c9d28ad6bac0363a8447c0c5c65f3..d45a15adf614aa1e23151146ae9cef10bf5c59dc 100644 (file)
--- a/inc/modules/member/what-cash_coupon.php
+++ b/inc/modules/member/what-cash_coupon.php
@@ -149,7 +149,7 @@ LIMIT 1",
        }
 } elseif (isFormSent('change')) {
        // Change receive status, depending on its current state
-       if (getUserData('receiving_coupons') == 'Y') {
+       if (isUserDataEnabled('receiving_coupons')) {
                // Unsubscribe from coupons
                $message = '{--MEMBER_COUPON_RECEIVE_STATUS_UNSUBSCRIBED--}';
                $newStatus = 'N';

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index bd934037f5ddeea3956795a0dc659b55e23e84a1..f6ed2dd996745f4599c16b3f2d8bb1f553473885 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -59,7 +59,7 @@ if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails'
 // Now check his points amount
 $total = getTotalPoints(getMemberId());
 
-if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (getUserData('holiday_active') == 'Y')) {
+if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active'))) {
        // Holiday is active!
        displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
 } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
@@ -179,7 +179,7 @@ LIMIT 1",
        if (empty($url)) {
                // Check if category and number of receivers is okay
                $add = '';
-               if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
+               if ((isOrderMultiPageEnabled()) && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
                        // Choose recipients by ZIP code
                        $add = sprintf(" AND d.zip LIKE '%s%%'",
                                bigintval(postRequestParameter('zip'))
@@ -220,10 +220,15 @@ ORDER BY
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
-       `userid`=%s AND `holiday_start` < UNIX_TIMESTAMP() AND `holiday_end` > UNIX_TIMESTAMP()
+       `userid`=%s AND
+       `holiday_start` < UNIX_TIMESTAMP() AND
+       `holiday_end` > UNIX_TIMESTAMP()
 LIMIT 1",
                                                array($holidayContent['userid']), __FILE__, __LINE__);
-                                       if (SQL_NUMROWS($result_holiday) == 1) $holidayContent['userid'] = '0'; // Exclude user who are in holiday
+                                       if (SQL_NUMROWS($result_holiday) == 1) {
+                                               // Exclude user who are in holiday
+                                               $holidayContent['userid'] = '0';
+                                       } // END - if
 
                                        // Free memory
                                        SQL_FREERESULT($result_holiday);
@@ -249,17 +254,21 @@ LIMIT 1",
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
                                array(
                                        convertReceivers($receiver),
-                                       $content['target_send']
+                                       bigintval($content['target_send'])
                                ), __FILE__, __LINE__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it
-                       if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
+                       if ($content['target_send'] > postRequestParameter('receiver')) {
+                               $content['target_send'] = bigintval(postRequestParameter('receiver'));
+                       } // END - if
 
                        // Calculate used points
                        $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
 
                        // Fix empty zip code
-                       if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0);
+                       if (!isPostRequestParameterSet('zip')) {
+                               setPostRequestParameter('zip', 0);
+                       } // END - if
 
                        // Check if he has enougth points for this order and selected more than 0 receivers
                        if (($USED > 0) && ($USED <= $total) && ($content['target_send'] > 0)) {
@@ -269,8 +278,35 @@ LIMIT 1",
                                        $id = '0';
                                        if (isExtensionActive('html_mail')) {
                                                // HTML extension is active
-                                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_pool` (`sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `zip`, `html_msg`)
-VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
+                                               SQL_QUERY_ESC("INSERT INTO
+       `{?_MYSQL_PREFIX?}_pool`
+(
+       `sender`,
+       `subject`,
+       `text`,
+       `receivers`,
+       `payment_id`,
+       `data_type`,
+       `timestamp`,
+       `url`,
+       `cat_id`,
+       `target_send`,
+       `zip`,
+       `html_msg`
+) VALUES (
+       %s,
+       '%s',
+       '%s',
+       '%s',
+       %s,
+       'TEMP',
+       UNIX_TIMESTAMP(),
+       '%s',
+       %s,
+       %s,
+       %s,
+       '%s'
+)",
                                                        array(
                                                                getMemberId(),
                                                                postRequestParameter('subject'),
@@ -279,14 +315,39 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
                                                                bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
-                                                               $content['target_send'],
+                                                               bigintval($content['target_send']),
                                                                bigintval(postRequestParameter('zip'), true, false),
                                                                postRequestParameter('html')
                                                        ), __FILE__, __LINE__);
                                        } else {
                                                // No HTML extension is active
-                                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_pool` (`sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `zip`)
-VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
+                                               SQL_QUERY_ESC("INSERT INTO
+       `{?_MYSQL_PREFIX?}_pool`
+(
+       `sender`,
+       `subject`,
+       `text`,
+       `receivers`,
+       `payment_id`,
+       `data_type`,
+       `timestamp`,
+       `url`,
+       `cat_id`,
+       `target_send`,
+       `zip`
+) VALUES (
+       %s,
+       '%s',
+       '%s',
+       '%s',
+       %s,
+       'TEMP',
+       UNIX_TIMESTAMP(),
+       '%s',
+       %s,
+       %s,
+       %s
+)",
                                                        array(
                                                                getMemberId(),
                                                                postRequestParameter('subject'),
@@ -295,7 +356,7 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
                                                                bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
-                                                               $content['target_send'],
+                                                               bigintval($content['target_send']),
                                                                bigintval(postRequestParameter('zip'), true, false),
                                                        ), __FILE__, __LINE__);
                                        }
@@ -426,7 +487,9 @@ ORDER BY
                        // Enable HTML checking
                        // @TODO Rewrite this to a filter
                        $HTML = ''; $HOL_STRING = '';
-                       if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
+                       if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
+                               $HTML = " AND `html`='Y'";
+                       } // END - if
                        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                                // Extension's version is fine
                                $HOL_STRING = " AND `holiday_active`='N'";
@@ -480,7 +543,7 @@ LIMIT 1",
                                                $result_ver = SQL_QUERY_ESC("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s".$HTML." AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
                                                        array(bigintval($userid)), __FILE__, __LINE__);
 
-                                               if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (getConfig('order_multi_page') == 'Y')) {
+                                               if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (isOrderMultiPageEnabled())) {
                                                        // Get zip code
                                                        list($zip) = SQL_FETCHROW($result_ver);
                                                        if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) {
@@ -588,7 +651,7 @@ LIMIT 1",
                                // Free result
                                SQL_FREERESULT($result);
 
-                               if ((isPostRequestParameterSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
+                               if ((isPostRequestParameterSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
                                        // Pre-output categories
                                        $content['category_selection'] = '';
                                        foreach ($categories['id'] as $key => $value) {
@@ -641,7 +704,7 @@ LIMIT 1",
                                        $content['zip_content'] = '';
 
                                        // Do we want ZIP code or not?
-                                       if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) {
+                                       if ((isOrderMultiPageEnabled()) || (isAdmin())) {
                                                // Yes
                                                if (postRequestParameter('zip') > 0) {
                                                        $data = array(

diff --git a/inc/modules/order.php b/inc/modules/order.php
index c9c4ae5458377f951180351e53f924645d0daf79..c12566fa877ae9101364fb8b5746e423ba80e317 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -83,15 +83,19 @@ if (empty($url)) {
                SQL_FREERESULT($result);
 
                // Fix empty subject line
-               if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+               if (empty($content['subject'])) {
+                       $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+               } // END - if
 
                // Calculate used points
-               $usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
+               $content['payed_points'] = $content['target_send'] * getPaymentPoints($content['payment_id']);
+               subtractPoints('order', getMemberId(), $content['payed_points']);
 
                // Update used points
                $add = '';
-               if (getConfig('order_max_full') == 'ORDER') $add = ', `mail_orders`=`mail_orders`+1';
-               subtractPoints('order', getMemberId(), $usedPoints);
+               if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
+                       $add = ', `mail_orders`=`mail_orders`+1';
+               } // END - if
 
                // Send an email to the user
                $message_mem = loadEmailTemplate('member_order_normal', $content, getMemberId());

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 8a4387f00be239a9611c964f853e51b24784c536..d73e687bf2e4fe0a739b10d827a34c49e42196b6 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -948,6 +948,18 @@ function getUserData ($column) {
        return $GLOBALS['user_data'][getCurrentUserId()][$column];
 }
 
+// Checks wether given user data is set to 'Y'
+function isUserDataEnabled ($column) {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][getCurrentUserId()][$column]))
+               // Determine it
+               $GLOBALS[__FUNCTION__][getCurrentUserId()][$column] = (getUserData($column) == 'Y')
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][getCurrentUserId()][$column];
+}
+
 // Geter for whole user data array
 function getUserDataArray () {
        // Get user id

diff --git a/templates/de/emails/admin/admin_order_normal.tpl b/templates/de/emails/admin/admin_order_normal.tpl
index 25d01afa6a3e8d1bf3821d8504cfd0d88481b6d5..52433de67bef11b1b0ac8495a45e0b2e5d14358d 100644 (file)
--- a/templates/de/emails/admin/admin_order_normal.tpl
+++ b/templates/de/emails/admin/admin_order_normal.tpl
@@ -14,6 +14,7 @@ Gebuchte Kategorie: {%pipe,getCategory=$content[cat_id]%}
 Gebuchter Payment-Typ: {%pipe,getPaymentTitlePrice=$content[payment_id]%}
 Betreffzeile in den Mails: $content[subject]
 Gebuchte URL: $content[url]
+Bezahlte {?POINTS?}: $content[payed_points]
 ------------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------------

diff --git a/templates/de/emails/member/member_order_normal.tpl b/templates/de/emails/member/member_order_normal.tpl
index 8dbf11fb6f65907c38e886665f71f471cd069e04..093733e40e4563c8c60ec9c19e8cd01e1d21f90d 100644 (file)
--- a/templates/de/emails/member/member_order_normal.tpl
+++ b/templates/de/emails/member/member_order_normal.tpl
@@ -8,6 +8,7 @@ Gebuchte Kategorie: {%pipe,getCategory=$content[cat_id]%}
 Gebuchter Payment-Typ: {%pipe,getPaymentTitlePrice=$content[payment_id]%}
 Betreffzeile in den Mails: $content[subject]
 Gebuchte URL: $content[url]
+Bezahlte {?POINTS?}: $content[payed_points]
 ------------------------------------------------
 
 Werbetext:

diff --git a/templates/de/html/admin/admin_admins_mails_edit.tpl b/templates/de/html/admin/admin_admins_mails_edit.tpl
index ce4665c6e3ef222fe8471e98d6c6da4a1e33c410..76fda6e1c7e2e5ac566471e0ca95d033da2fcc33 100644 (file)
--- a/templates/de/html/admin/admin_admins_mails_edit.tpl
+++ b/templates/de/html/admin/admin_admins_mails_edit.tpl
@@ -18,7 +18,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_EDIT_ADMINS_MAILS_SUBMIT--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_EDIT_ADMINS_MAILS_SUBMIT--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_config_rallye_del.tpl b/templates/de/html/admin/admin_config_rallye_del.tpl
index d2904a115f2ed0e0a9ce2cf6144f255ee86b850e..8b1725dd0e6d6cb418cf81e6b6a62a47ec7728b8 100644 (file)
--- a/templates/de/html/admin/admin_config_rallye_del.tpl
+++ b/templates/de/html/admin/admin_config_rallye_del.tpl
@@ -23,7 +23,7 @@
        $content[rows]
        <tr>
                <td colspan="4" class="table_footer">
-                       <input type="submit" name="remove" class="form_delete" value="{--RALLYE_REMOVE_PRICES--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--RALLYE_REMOVE_PRICES--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_config_rallye_edit.tpl b/templates/de/html/admin/admin_config_rallye_edit.tpl
index fba50b4d83a70036dd5a9b1f377a8803526b0a52..9a048d453e0ed7050bb1ef45a1c13afe04e95121 100644 (file)
--- a/templates/de/html/admin/admin_config_rallye_edit.tpl
+++ b/templates/de/html/admin/admin_config_rallye_edit.tpl
@@ -24,7 +24,7 @@
        <tr>
                <td colspan="4" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--RALLYE_CHANGE_PRICES--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--RALLYE_CHANGE_PRICES--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_del_bank_packages.tpl b/templates/de/html/admin/admin_del_bank_packages.tpl
index f96d36f8c2dcc9d2c3dc7943b7c6de81d2fcbeb1..a682a1043b7a916a02b4387bf96568294bd88b88 100644 (file)
--- a/templates/de/html/admin/admin_del_bank_packages.tpl
+++ b/templates/de/html/admin/admin_del_bank_packages.tpl
@@ -15,7 +15,7 @@
        $content
        <tr>
                <td colspan="5" class="table_footer">
-                       <input type="submit" name="remove" class="form_delete" value="{--DEL_ENTRIES--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--DEL_ENTRIES--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_delete_admins.tpl b/templates/de/html/admin/admin_delete_admins.tpl
index 1082a2123ee3ecf2a338d8f1e12410a2c34b59d5..2d34699469584beab6cd6bbf9cfab29484ab0d1f 100644 (file)
--- a/templates/de/html/admin/admin_delete_admins.tpl
+++ b/templates/de/html/admin/admin_delete_admins.tpl
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_ADMINS_DELETE--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_ADMINS_DELETE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_delete_admins_acls.tpl b/templates/de/html/admin/admin_delete_admins_acls.tpl
index 8cc74b234572a116cdf3fbf1118f0d7784732e53..46a4b6b5495ae72b47b54bcbef9ce07e5e1ab84f 100644 (file)
--- a/templates/de/html/admin/admin_delete_admins_acls.tpl
+++ b/templates/de/html/admin/admin_delete_admins_acls.tpl
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_ADMINS_REMOVE_ACLS_SUBMIT--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_ADMINS_REMOVE_ACLS_SUBMIT--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_delete_network_params.tpl b/templates/de/html/admin/admin_delete_network_params.tpl
index e849f8b62ba5e3938cb0249cf4c02b5296f60d41..9c413fcb304de13415d782f89da60450a1ef4d91 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_params.tpl
+++ b/templates/de/html/admin/admin_delete_network_params.tpl
@@ -15,7 +15,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="form_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE--}" />
+                       <input type="submit" name="do_delete" class="form_submit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_delete_network_types.tpl b/templates/de/html/admin/admin_delete_network_types.tpl
index 3b38c214876e0f376301c7993d25010c0cb24d59..fc581314a4df8dea6cf534a93812620e8e189822 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_types.tpl
+++ b/templates/de/html/admin/admin_delete_network_types.tpl
@@ -15,7 +15,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_NETWORK_TYPES_REMOVE--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_NETWORK_TYPES_REMOVE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_delete_networks.tpl b/templates/de/html/admin/admin_delete_networks.tpl
index aa25e5b395eaa4f7e6f765748b7a3ae11e6f9dcd..f3a67cceedcf4c23a9a0c777b3a590ac4cc366ec 100644 (file)
--- a/templates/de/html/admin/admin_delete_networks.tpl
+++ b/templates/de/html/admin/admin_delete_networks.tpl
@@ -10,7 +10,7 @@
        <tr>
                <td colspan="4" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_NETWORK_REMOVE--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_NETWORK_REMOVE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_delete_payouts.tpl b/templates/de/html/admin/admin_delete_payouts.tpl
index 9e62cd537e71db4eeaf5d160155dfc8127c7295e..4b965442aff0dced97f49da8863841a25d74acdb 100644 (file)
--- a/templates/de/html/admin/admin_delete_payouts.tpl
+++ b/templates/de/html/admin/admin_delete_payouts.tpl
@@ -14,7 +14,7 @@
        $content
        <tr>
                <td colspan="4" class="table_footer">
-                       <input type="submit" class="form_delete" name="remove" value="{--ADMIN_PAYOUT_DELETE--}" />
+                       <input type="submit" class="form_delete" name="do_delete" value="{--ADMIN_PAYOUT_DELETE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_admins.tpl b/templates/de/html/admin/admin_edit_admins.tpl
index 94bbbcf55fadcb73025ac9d4b5b0e7dc1bac8300..4e8734ed91c4d7ff7eb3a878bc60814feda785ed 100644 (file)
--- a/templates/de/html/admin/admin_edit_admins.tpl
+++ b/templates/de/html/admin/admin_edit_admins.tpl
@@ -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="change" value="{--ADMIN_ADMINS_EDIT--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_ADMINS_EDIT--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_admins_acls.tpl b/templates/de/html/admin/admin_edit_admins_acls.tpl
index dce8929bdd6a87335d5615bfd03ba86ae6f8c600..124a53116cc6fb5bb02e8be9438720e5e05d742d 100644 (file)
--- a/templates/de/html/admin/admin_edit_admins_acls.tpl
+++ b/templates/de/html/admin/admin_edit_admins_acls.tpl
@@ -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="change" value="{--ADMIN_ADMINS_CHANGE_ACLS_SUBMIT--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_ADMINS_CHANGE_ACLS_SUBMIT--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_mods.tpl b/templates/de/html/admin/admin_edit_mods.tpl
index 0f27b51e160667c667633849dc742662cd099790..6ebfb0b5200c9aefd7891e87f07d2dd067d2baa5 100644 (file)
--- a/templates/de/html/admin/admin_edit_mods.tpl
+++ b/templates/de/html/admin/admin_edit_mods.tpl
@@ -18,7 +18,7 @@ $content
 <tr>
        <td colspan="6" class="table_footer">
                <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-               <input type="submit" class="form_submit" name="change" value="{--SAVE_CHANGES--}" />
+               <input type="submit" class="form_submit" name="do_edit" value="{--SAVE_CHANGES--}" />
        </td>
 </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_network_params.tpl b/templates/de/html/admin/admin_edit_network_params.tpl
index d78bfddd5a9f50cd4f039373e88a3fe1ef5f5cff..5095dae520ac4a8372ef4a4ae8e2951e0b914657 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_params.tpl
+++ b/templates/de/html/admin/admin_edit_network_params.tpl
@@ -15,7 +15,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl
index 9d65c3902a6c05e994ff4575521c8815d359ed27..6da26978d3c8524487a489da132cc1308a5f31be 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_types.tpl
+++ b/templates/de/html/admin/admin_edit_network_types.tpl
@@ -15,7 +15,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_NETWORK_TYPES_CHANGE--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_NETWORK_TYPES_CHANGE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_networks.tpl b/templates/de/html/admin/admin_edit_networks.tpl
index ae27188926b7765d940c625097c91b5eb5efcd84..ed0dc02d26d70b618b13cd33f8579ac89b954c63 100644 (file)
--- a/templates/de/html/admin/admin_edit_networks.tpl
+++ b/templates/de/html/admin/admin_edit_networks.tpl
@@ -10,7 +10,7 @@
        <tr>
                <td colspan="4" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_NETWORK_CHANGE--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_NETWORK_CHANGE--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_payouts.tpl b/templates/de/html/admin/admin_edit_payouts.tpl
index efb883be9b55d47ac3759ddfff95bf64dee12111..caf648970b9b23e9a7d290d0c6db9fb1ba032b3c 100644 (file)
--- a/templates/de/html/admin/admin_edit_payouts.tpl
+++ b/templates/de/html/admin/admin_edit_payouts.tpl
@@ -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="change" value="{--ADMIN_PAYOUT_EDIT--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_PAYOUT_EDIT--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_edit_rallyes.tpl b/templates/de/html/admin/admin_edit_rallyes.tpl
index ce745611ca696e846615eae51f3554307124aa4e..2d18ef7c886f549c18c7305cf6b837f3bdfb6471 100644 (file)
--- a/templates/de/html/admin/admin_edit_rallyes.tpl
+++ b/templates/de/html/admin/admin_edit_rallyes.tpl
@@ -8,7 +8,7 @@
        <tr>
                <td colspan="3" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--RALLYE_CHANGE_ADMIN--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--RALLYE_CHANGE_ADMIN--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_extensions.tpl b/templates/de/html/admin/admin_extensions.tpl
index 62691347eb2c2f02c87f58ad6bbb7a94c1e0ea17..50017ac897b0c9570a7f518cb67fe580dcc44168 100644 (file)
--- a/templates/de/html/admin/admin_extensions.tpl
+++ b/templates/de/html/admin/admin_extensions.tpl
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="5" class="table_footer">
                        <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="do_edit" 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--}" />
                </td>

diff --git a/templates/de/html/admin/admin_extensions_delete.tpl b/templates/de/html/admin/admin_extensions_delete.tpl
index ed3bb647e1094f37aa9e05a5600eec24ab54cfe3..87483eac4096074365cea972153437480651516e 100644 (file)
--- a/templates/de/html/admin/admin_extensions_delete.tpl
+++ b/templates/de/html/admin/admin_extensions_delete.tpl
@@ -14,7 +14,7 @@
        $content
        <tr>
                <td colspan="3" class="table_footer">
-                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_REMOVE_EXTENSIONS--}" />
+                       <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_REMOVE_EXTENSIONS--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl
index 9f5cdf280ee7ce30820ad770500f10097b460c21..bfd7d84b19ce0d2e923fb773c9db96f42574631a 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl
@@ -17,7 +17,7 @@ $content
 <tr>
        <td align="center" colspan="5" class="table_footer">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_delete" name="remove" value="{--DEL_ENTRIES--}" />
+               <input type="submit" class="form_delete" name="do_delete" value="{--DEL_ENTRIES--}" />
        </td>
 </tr>
 </table>

diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl
index 6ba05061880241b359cedc575433e9642ba421f3..8c9c71a41d8e5176af56d0ef3be5f647ceaf13e3 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl
@@ -17,7 +17,7 @@ $content
 <tr>
        <td align="center" colspan="5" class="table_footer">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="change" value="{--SUBMIT_CHANGES--}" />
+               <input type="submit" class="form_submit" name="do_edit" value="{--SUBMIT_CHANGES--}" />
        </td>
 </tr>
 </table>

diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
index e52297f00b0fbe2deafe08c856fc50234603b5e9..945e30ff9ba997aad363a4681631c021aca16150 100644 (file)
--- a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
+++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
@@ -15,7 +15,7 @@
                        <table border="0" cellspacing="0" cellpadding="1" width="100%">
                        <tr>
                                <td><input type="submit" class="form_submit" name="ok" value="{--ADMIN_YOOMEDIA_PREPARE_MAIL--}" /></td>
-                               <td><input type="submit" class="form_delete" name="remove" value="{--ADMIN_YOOMEDIA_REMOVE_MAIL--}" /></td>
+                               <td><input type="submit" class="form_delete" name="do_delete" value="{--ADMIN_YOOMEDIA_REMOVE_MAIL--}" /></td>
                        </tr>
                        </table>
                </form>