X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Ftask_functions.php;h=2b34fa214c31b1c3dbe221b980c2baf20c4495d7;hb=4e7273a155c9afa62cf0e094f96e206455b8bdde;hp=7437043b4634d4f9dbb9daf20794a252386888bd;hpb=143e78d4231adddd9e706cbf55ec5dd8c1651890;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 7437043b46..2b34fa214c 100644
--- 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;
@@ -336,6 +336,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") {
@@ -354,12 +362,13 @@ ORDER BY d.userid";
 
 		// Autopurge installed?
 		$LAST = "";
-		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
 			// Use last online timestamp to keep inactive members away from here
 			$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";
@@ -372,7 +381,7 @@ ORDER BY active_bonus DESC, userid";
 
 		// Autopurge installed?
 		$LAST = "";
-		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
 			// Use last online timestamp to keep inactive members away from here
 			$LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
 		}
@@ -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";