Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / inc / modules / admin / what-config_bonus.php

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index b50b55ee0a70876195a67509884bef489aeb6d7c..cfce062364333f305551085af4fdd59d5992717d 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -40,33 +40,34 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok'])) {
+if (IS_FORM_SENT()) {
        // Replace german decimal commas to computer decimal dots
-       $_POST['login_bonus']         = REVERT_COMMA($_POST['login_bonus']        );
-       $_POST['turbo_bonus']         = REVERT_COMMA($_POST['turbo_bonus']        );
-       $_POST['bonus_ref']           = REVERT_COMMA($_POST['bonus_ref']          );
-       $_POST['bonus_order']         = REVERT_COMMA($_POST['bonus_order']        );
-       $_POST['bonus_notify_points'] = REVERT_COMMA($_POST['bonus_notify_points']);
+       REQUEST_POST('login_bonus')         = REVERT_COMMA(REQUEST_POST('login_bonus')        );
+       REQUEST_POST('turbo_bonus')         = REVERT_COMMA(REQUEST_POST('turbo_bonus')        );
+       REQUEST_POST('bonus_ref')           = REVERT_COMMA(REQUEST_POST('bonus_ref')          );
+       REQUEST_POST('bonus_order')         = REVERT_COMMA(REQUEST_POST('bonus_order')        );
+       REQUEST_SET_POST('bonus_notify_points', REVERT_COMMA(REQUEST_POST('bonus_notify_points')));
 
        // Generate string for saving ranks
-       $_POST['turbo_rates'] = ""; $RATES = array();
-       foreach ($_POST['rate'] as $rate) {
+       REQUEST_SET_POST('turbo_rates', "");
+       $RATES = array();
+       foreach (REQUEST_POST('rate') as $rate) {
                $rate = trim(REVERT_COMMA($rate));
-               if (isset($rate)) $RATES[] = $rate;
+               if (!empty($rate)) $RATES[] = $rate;
        }
-       $_POST['turbo_rates'] = trim(implode(";", $RATES));
-       unset($_POST['rate']);
+       REQUEST_SET_POST('turbo_rates', trim(implode(";", $RATES)));
+       REQUEST_UNSET_POST(('rate'));
 
        // Automatically calculate bonus points for ranks 2 and 3 when not set
-       if (empty($_POST['turbo_rates'])) $_POST['turbo_rates'] = "".round(getConfig('turbo_bonus') / 2).";".round(getConfig('turbo_bonus') / 4)."";
+       if (!REQUEST_ISSET_POST(('turbo_rates'))) REQUEST_SET_POST('turbo_rates', "".round(getConfig('turbo_bonus') / 2).";".round(getConfig('turbo_bonus') / 4)."");
 
        // Save data
-       ADMIN_SAVE_SETTINGS($_POST);
+       ADMIN_SAVE_SETTINGS_POST();
 
        // Remember new settings
-       setConfigEntry('bonus_active'   , $_POST['bonus_active']);
-       setConfigEntry('bonus_en_notify', $_POST['bonus_en_notify']);
-       setConfigEntry('bonus_di_notify', $_POST['bonus_di_notify']);
+       setConfigEntry('bonus_active'   , REQUEST_POST('bonus_active'));
+       setConfigEntry('bonus_en_notify', REQUEST_POST('bonus_en_notify'));
+       setConfigEntry('bonus_di_notify', REQUEST_POST('bonus_di_notify'));
 } else {
        // Prepare contants for the template
        define('__LOGIN_VALUE' , TRANSLATE_COMMA(getConfig('login_bonus')        , false));