More fixes, thanks to Piter01

[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 9e4641d08ba8d59214ea3212055bd3fc642960e0..3e3308027ebd003bc1b62607ace2210a9edf408f 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -38,22 +38,20 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
        // Replace german decimal commas to computer decimal dots
-       $_POST['login_bonus']         = str_replace(",", ".", $_POST['login_bonus']        );
-       $_POST['turbo_bonus']         = str_replace(",", ".", $_POST['turbo_bonus']        );
-       $_POST['bonus_ref']           = str_replace(",", ".", $_POST['bonus_ref']          );
-       $_POST['bonus_order']         = str_replace(",", ".", $_POST['bonus_order']        );
-       $_POST['bonus_notify_points'] = str_replace(",", ".", $_POST['bonus_notify_points']);
+       $_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']);
 
        // Generate string for saving ranks
        $_POST['turbo_rates'] = ""; $RATES = array();
-       foreach ($_POST['rate'] as $rate)
-       {
-               $rate = trim(str_replace(",", ".", $rate));
+       foreach ($_POST['rate'] as $rate) {
+               $rate = trim(REVERT_COMMA($rate));
                if (isset($rate)) $RATES[] = $rate;
        }
        $_POST['turbo_rates'] = trim(implode(";", $RATES));
@@ -69,11 +67,6 @@ if (isset($_POST['ok']))
        $_CONFIG['bonus_active']    = $_POST['bonus_active'];
        $_CONFIG['bonus_en_notify'] = $_POST['bonus_en_notify'];
        $_CONFIG['bonus_di_notify'] = $_POST['bonus_di_notify'];
-
-       // Include sending out mails
-       if ((($_CONFIG['bonus_active'] == "Y") && ($_CONFIG['bonus_en_notify'] == "Y")) || (($_CONFIG['bonus_active'] == "N") && ($_CONFIG['bonus_di_notify'] == "Y"))) {
-               include(PATH."inc/mails/bonus_mails.php");
-       }
 } else {
        // Prepare contants for the template
        define('__LOGIN_VALUE' , TRANSLATE_COMMA($_CONFIG['login_bonus']        , false));
@@ -93,7 +86,7 @@ if (isset($_POST['ok']))
        $RANKS = explode(";", $_CONFIG['turbo_rates']);
 
        // Automatically calculate bonus points for ranks 2 and 3 when not set
-       if (empty($_CONFIG['bonus_ranks'])) $RANKS = array(round($_CONFIG['turbo_bonus'] / 2), round($_CONFIG['turbo_bonus'] / 4));
+       if (empty($_CONFIG['turbo_rates'])) $RANKS = array(round($_CONFIG['turbo_bonus'] / 2), round($_CONFIG['turbo_bonus'] / 4));
 
        // Generate list
        $OUT = "<OL start=\"2\">\n";