- Daily/weekly/monthly reset completely rewritten

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

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 721ee92dd8763c8c5f53e25f11f8e59ea30068cd..caefd309c9a63003fd8b3966756ddc8691bc7460 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -40,22 +40,18 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-if ($_CONFIG['bonus_active'] == "Y")
-{
+if ($_CONFIG['bonus_active'] == "Y") {
        // Shall I withdraw now?
-       if (isset($_POST['withdraw']))
-       {
+       if (isset($_POST['withdraw'])) {
                // Okay, let's prepare...
                $curr = date("m", time()) - 1;
                if (strlen($curr) == 1) $curr = "0".$curr;
-               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET last_bonus_month='%s' WHERE config=0 LIMIT 1",
-                array($curr), __FILE__, __LINE__);
+               UPDATE_CONFIG("last_month", $curr);
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_WITHDRAW_PREPARED);
                OUTPUT_HTML("<br />");
        }
 
-       if (GET_EXT_VERSION("bonus") >= "0.6.9")
-       {
+       if (GET_EXT_VERSION("bonus") >= "0.6.9") {
                // Add more bonus points here
                $USE = "(0";
                if ($_CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus";
@@ -64,17 +60,14 @@ if ($_CONFIG['bonus_active'] == "Y")
                if ($_CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats";
                if ($_CONFIG['bonus_ref_yn']   == "Y") $USE .= " + bonus_ref";
                $USE .= ")";
-       }
-        else
-       {
+       } else {
                // Old version ???
                $USE = "turbo_bonus";
        }
 
        // Autopurge installed?
        $LAST = "%s"; $ONLINE = "";
-       if (EXT_IS_ACTIVE("autopurge"))
-       {
+       if (EXT_IS_ACTIVE("autopurge")) {
                // Use last online timestamp to keep inactive members away from here
                $LAST   = " AND last_online >= %s";
                $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']);
@@ -87,20 +80,19 @@ WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY active_bonus DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
 
-       if (SQL_NUMROWS($result) > 0)
-       {
+       if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
-               while(list($uid, $email, $sex, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result))
-               {
+               while(list($uid, $email, $sex, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
-                       if ($cnt <= $_CONFIG['bonus_ranks'])
-                       {
+                       if ($cnt <= $_CONFIG['bonus_ranks']) {
                                // Maybe he can win his active bonus?
                                $WIN1 = "<STRONG>";
                                $WIN2 = "</STRONG>";
                        }
+
+                       // Prepare content
                        $content = array(
                                'uid'   => $uid,
                                'email' => CREATE_EMAIL_LINK($email, "user_data"),
@@ -123,7 +115,7 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
                define('__TOTAL', TRANSLATE_COMMA($total));
 
                // Check if we need to display form or not with manuel withdraw
-               if ($_CONFIG['bonus_month'] == date("m", time()))
+               if ($_CONFIG['last_month'] == date("m", time()))
                {
                        // Load form
                        define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));