Another column fix

[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 70bf8e32b552e34818022b3774782dd673cc93cd..e7a1bb2998df93f1d671e2d4ce017cfe6e173b88 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
@@ -71,13 +71,10 @@ if (isset($_POST['ok']))
        $_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')))
-       {
+       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
-{
+} else {
        // Prepare contants for the template
        define('__LOGIN_VALUE' , TRANSLATE_COMMA($_CONFIG['login_bonus']        , false));
        define('__TURBO_VALUE' , TRANSLATE_COMMA($_CONFIG['turbo_bonus']        , false));
@@ -89,26 +86,23 @@ if (isset($_POST['ok']))
        define('__TLINES_VALUE', $_CONFIG['bonus_lines']);
 
        // Transfer options to template __MEMBER_SELECTION
-       ADD_MEMBER_SELECTION_BOX(false, true, true, $_CONFIG['bonus_uid']);
+       define('__MEMBER_SELECTION', ADD_MEMBER_SELECTION_BOX($_CONFIG['bonus_uid'], false, true, true));
 
        // Initialize array for the points list
-       $RANKS = explode(";", $_CONFIG['bonus_rates']);
+       $RANKS = explode(";", $_CONFIG['bonus_ranks']);
 
        // Automatically calculate bonus points for ranks 2 and 3 when not set
-       if (empty($_CONFIG['bonus_rates'])) $RANKS = array(round($_CONFIG['turbo_bonus'] / 2), round($_CONFIG['turbo_bonus'] / 4));
+       if (empty($_CONFIG['bonus_ranks'])) $RANKS = array(round($_CONFIG['turbo_bonus'] / 2), round($_CONFIG['turbo_bonus'] / 4));
 
        // Generate list
        $OUT = "<OL start=\"2\">\n";
-       foreach ($RANKS as $k=>$rate)
-       {
-               if (!empty($rate))
-               {
+       foreach ($RANKS as $k => $rate) {
+               if (!empty($rate))      {
                        // Print only when something is in
                        $OUT .= "  <LI><INPUT type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\">&nbsp;<FONT class=\"admin_notes\">(".POINTS.")</FONT?</LI>\n";
                }
        }
-       for ($i = 3; $i < 8; $i++)
-       {
+       for ($i = 3; $i < 8; $i++) {
                $OUT .= "  <LI><INPUT type=\"text\" name=\"rate[".($k + $i)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\">&nbsp;<FONT class=\"admin_notes\">(".POINTS.")</FONT?</LI>\n";
        }
        $OUT .= "</OL>\n";
@@ -122,122 +116,122 @@ if (isset($_POST['ok']))
        switch ($_CONFIG['bonus_active'])
        {
        case 'Y':
-               define('__BONUS_ACTIVE_Y', ' checked');
+               define('__BONUS_ACTIVE_Y', " checked=\"checked\"");
                define('__BONUS_ACTIVE_N', "");
                break;
 
        case 'N':
                define('__BONUS_ACTIVE_Y', "");
-               define('__BONUS_ACTIVE_N', ' checked');
+               define('__BONUS_ACTIVE_N', " checked=\"checked\"");
                break;
        }
        // Other bonus to de-/activate
        switch ($_CONFIG['bonus_login_yn'])
        {
        case 'Y':
-               define('__BONUS_LOGIN_Y', ' checked');
+               define('__BONUS_LOGIN_Y', " checked=\"checked\"");
                define('__BONUS_LOGIN_N', "");
                break;
 
        case 'N':
                define('__BONUS_LOGIN_Y', "");
-               define('__BONUS_LOGIN_N', ' checked');
+               define('__BONUS_LOGIN_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_stats_yn'])
        {
        case 'Y':
-               define('__BONUS_STATS_Y', ' checked');
+               define('__BONUS_STATS_Y', " checked=\"checked\"");
                define('__BONUS_STATS_N', "");
                break;
 
        case 'N':
                define('__BONUS_STATS_Y', "");
-               define('__BONUS_STATS_N', ' checked');
+               define('__BONUS_STATS_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_order_yn'])
        {
        case 'Y':
-               define('__BONUS_ORDER_Y', ' checked');
+               define('__BONUS_ORDER_Y', " checked=\"checked\"");
                define('__BONUS_ORDER_N', "");
                break;
 
        case 'N':
                define('__BONUS_ORDER_Y', "");
-               define('__BONUS_ORDER_N', ' checked');
+               define('__BONUS_ORDER_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_ref_yn'])
        {
        case 'Y':
-               define('__BONUS_REF_Y', ' checked');
+               define('__BONUS_REF_Y', " checked=\"checked\"");
                define('__BONUS_REF_N', "");
                break;
 
        case 'N':
                define('__BONUS_REF_Y', "");
-               define('__BONUS_REF_N', ' checked');
+               define('__BONUS_REF_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_click_yn'])
        {
        case 'Y':
-               define('__BONUS_CLICK_Y', ' checked');
+               define('__BONUS_CLICK_Y', " checked=\"checked\"");
                define('__BONUS_CLICK_N', "");
                break;
 
        case 'N':
                define('__BONUS_CLICK_Y', "");
-               define('__BONUS_CLICK_N', ' checked');
+               define('__BONUS_CLICK_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_en_notify'])
        {
        case 'Y':
-               define('__BONUS_EN_NOTIFY_Y', ' checked');
+               define('__BONUS_EN_NOTIFY_Y', " checked=\"checked\"");
                define('__BONUS_EN_NOTIFY_N', "");
                break;
 
        case 'N':
                define('__BONUS_EN_NOTIFY_Y', "");
-               define('__BONUS_EN_NOTIFY_N', ' checked');
+               define('__BONUS_EN_NOTIFY_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_di_notify'])
        {
        case 'Y':
-               define('__BONUS_DI_NOTIFY_Y', ' checked');
+               define('__BONUS_DI_NOTIFY_Y', " checked=\"checked\"");
                define('__BONUS_DI_NOTIFY_N', "");
                break;
 
        case 'N':
                define('__BONUS_DI_NOTIFY_Y', "");
-               define('__BONUS_DI_NOTIFY_N', ' checked');
+               define('__BONUS_DI_NOTIFY_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_new_mem_notify'])
        {
        case 'Y':
-               define('__BONUS_NEW_MEMBER_NOTIFY_Y', ' checked');
+               define('__BONUS_NEW_MEMBER_NOTIFY_Y', " checked=\"checked\"");
                define('__BONUS_NEW_MEMBER_NOTIFY_N', "");
                break;
 
        case 'N':
                define('__BONUS_NEW_MEMBER_NOTIFY_Y', "");
-               define('__BONUS_NEW_MEMBER_NOTIFY_N', ' checked');
+               define('__BONUS_NEW_MEMBER_NOTIFY_N', " checked=\"checked\"");
                break;
        }
        switch ($_CONFIG['bonus_include_own'])
        {
        case 'Y':
-               define('__BONUS_INCLUDE_OWN_Y', ' checked');
+               define('__BONUS_INCLUDE_OWN_Y', " checked=\"checked\"");
                define('__BONUS_INCLUDE_OWN_N', "");
                break;
 
        case 'N':
                define('__BONUS_INCLUDE_OWN_Y', "");
-               define('__BONUS_INCLUDE_OWN_N', ' checked');
+               define('__BONUS_INCLUDE_OWN_N', " checked=\"checked\"");
                break;
        }