Missing column 'active_bonus' fixed, some while() loops rewritten

[mailer.git] / inc / libs / task_functions.php

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 426309f2218c912cc890be037842be19cae3dac8..fbdea104d5b7f019cf5cd5aa6b200a5261f4f145 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -81,7 +81,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        SQL_FREERESULT($result);
 
        if ($value > 0) {
-               define('__CONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;mode=confirmed\">".$value."</A>");
+               define('__CONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</A>");
        } else {
                define('__CONFIRMED_VALUE', "0");
        }
@@ -103,7 +103,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        SQL_FREERESULT($result);
 
        if ($value > 0) {
-               define('__LOCKED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;mode=locked\">".$value."</A>");
+               define('__LOCKED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</A>");
        } else {
                define('__LOCKED_VALUE', "0");
        }
@@ -255,7 +255,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        // Sent bonus mails
        //
        if (GET_EXT_VERSION("bonus") >= "0.1.8") {
-               $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE data_type='SEND'", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE data_type='SEND' AND is_notify='N'", __FILE__, __LINE__);
                $value = SQL_NUMROWS($result);
                SQL_FREERESULT($result);
 
@@ -273,7 +273,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        if (EXT_IS_ACTIVE("autopurge")) {
                // Start finding them...
                $since = $_CONFIG['ap_inactive_since'];
-               $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid']."";
+               $EXCLUDE_LIST = "";
+               if ($_CONFIG['def_refid'] > 0) {
+                       $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid']."";
+               } // END - if
 
                // Check for more extensions
                if (EXT_IS_ACTIVE("beg"))                  $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['beg_uid']."";
@@ -284,7 +287,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                // Check for all accounts
                $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online
 FROM "._MYSQL_PREFIX."_user_data AS d
-WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < ".$since." AND d.ap_notified < ".$since."
+WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < (UNIX_TIMESTAMP() - ".$since.") AND d.ap_notified < (UNIX_TIMESTAMP() - ".$since.")
 ".$EXCLUDE_LIST."
 ORDER BY d.userid";
                $WHATs[]  = "list_autopurge";
@@ -293,11 +296,11 @@ ORDER BY d.userid";
        }
 
        if (GET_EXT_VERSION("sql_patches") >= "0.3.4") {
-               // Check for accounts without referral
+               // Check for accounts without referal
                $SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE refid='0' ORDER BY userid";
                $DESCRs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF;
                $TITLEs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF_TITLE;
-               $WHATs[]  = "list_norefs";
+               $WHATs[]  = "list_user&amp;mode=norefs";
        }
 
        if (EXT_IS_ACTIVE("payout")) {
@@ -336,6 +339,14 @@ ORDER BY d.userid";
                $TITLEs[] = TASK_ADMIN_LIST_HOLIDAYS_TITLE;
        }
 
+       if (GET_EXT_VERSION("bonus") >= "0.8.7") {
+               // List all notifications
+               $SQLs[]   = "SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE is_notify='Y' ORDER BY timestamp DESC";
+               $WHATs[]  = "list_notifications";
+               $DESCRs[] = TASK_ADMIN_LIST_NOTIFICATIONS;
+               $TITLEs[] = TASK_ADMIN_LIST_NOTIFICATIONS_TITLE;
+       } // END - if
+
        if (GET_EXT_VERSION("bonus") >= "0.2.3") {
                // Active rallye
                if (GET_EXT_VERSION("bonus") >= "0.6.9") {
@@ -359,9 +370,10 @@ ORDER BY d.userid";
                        $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
                }
 
-               $SQLs[]   = "SELECT ".$USE." AS active_bonus FROM "._MYSQL_PREFIX."_user_data
+               $SQLs[]   = "SELECT ".$USE." AS points
+FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE.">0".$LAST."
-ORDER BY active_bonus DESC, userid";
+ORDER BY points DESC, userid";
                $WHATs[]  = "list_bonus";
                $DESCRs[] = TASK_ADMIN_LIST_BONUS;
                $TITLEs[] = TASK_ADMIN_LIST_BONUS_TITLE;
@@ -398,7 +410,7 @@ ORDER BY beg_points DESC, userid";
        }
 
        //
-       // All referral banner
+       // All referal banner
        //
        $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_refbanner ORDER BY id";
        $WHATs[] = "refbanner";
@@ -406,7 +418,7 @@ ORDER BY beg_points DESC, userid";
        $TITLEs[] = TASK_ADMIN_LIST_REFBANNER_ALL_TITLE;
 
        //
-       // All activated referral banner
+       // All activated referal banner
        //
        $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_refbanner WHERE visible='Y' ORDER BY id";
        $WHATs[] = "refbanner";