Referal overview finished and rewritten for refback extension

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 2d06f6575f124ec9454982684fb77a4cd272314b..d02865c36c2c3783d427069ee8a80c83b0a11f67 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -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);
 
@@ -276,9 +276,9 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid']."";
 
                // Check for more extensions
-               if (EXT_IS_ACTIVE("beg"))                  $EXCLUDE_LIST .= " AND d.userid != c.beg_uid";
-               if (EXT_IS_ACTIVE("bonus"))                $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
-               if (EXT_IS_ACTIVE("doubler"))              $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
+               if (EXT_IS_ACTIVE("beg"))                  $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['beg_uid']."";
+               if (EXT_IS_ACTIVE("bonus"))                $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['bonus_uid']."";
+               if (EXT_IS_ACTIVE("doubler"))              $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['doubler_uid']."";
                if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active='N'";
 
                // Check for all accounts
@@ -293,7 +293,7 @@ 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;
@@ -359,12 +359,21 @@ 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 active_bonus
+FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE.">0".$LAST."
 ORDER BY active_bonus DESC, userid";
                $WHATs[]  = "list_bonus";
                $DESCRs[] = TASK_ADMIN_LIST_BONUS;
                $TITLEs[] = TASK_ADMIN_LIST_BONUS_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;
+               }
        }
 
        if (GET_EXT_VERSION("beg") >= "0.1.2") {
@@ -398,7 +407,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 +415,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";