X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=432d96683ceb99737c5310d8897b1debe61fcaf4;hb=465859de0e017d99130df209391fe0742fc24271;hp=13ddfd2bb38022c063f19ae8acd7ee3c47466791;hpb=f8edd98ca34b49528284a22bd27aa937844f25ac;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 13ddfd2bb3..432d96683c 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -273,10 +273,10 @@ ORDER BY
 	}
 
 	if ((isExtensionInstalledAndNewer('sql_patches', '0.3.4')) && (isExtensionActive('user'))) {
-		// Check for accounts without referal
-		addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
-		$DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
-		$TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}';
+		// Check for accounts without referral
+		addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 OR `refid` IS NULL ORDER BY `userid` ASC");
+		$DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL--}';
+		$TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL_TITLE--}';
 		$WHATs[]  = 'list_user&mode=norefs';
 	} // END - if
 
@@ -290,7 +290,7 @@ ORDER BY
 		$WHATs[]  = 'list_payouts';
 		$DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE--}';
-	}
+	} // END - if
 
 	if (isExtensionActive('wernis')) {
 		// List new wernis requests
@@ -298,7 +298,7 @@ ORDER BY
 		$WHATs[]  = 'list_wernis';
 		$DESCRs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL_TITLE--}';
-	}
+	} // END - if
 
 	if (isExtensionActive('primera')) {
 		// List new primera requests
@@ -306,7 +306,7 @@ ORDER BY
 		$WHATs[]  = 'list_primera';
 		$DESCRs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL_TITLE--}';
-	}
+	} // END - if
 
 	if (isExtensionActive('holiday')) {
 		// List holiday requests
@@ -314,7 +314,7 @@ ORDER BY
 		$WHATs[]  = 'list_holiday';
 		$DESCRs[] = '{--ADMIN_TASK_LIST_HOLIDAYS--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_HOLIDAYS_TITLE--}';
-	}
+	} // END - if
 
 	if (isExtensionInstalledAndNewer('bonus', '0.8.7')) {
 		// List all notifications
@@ -326,20 +326,14 @@ ORDER BY
 
 	// Both extensions must be there
 	if ((isExtensionInstalledAndNewer('bonus', '0.2.3')) && (isExtensionActive('user'))) {
-		// Active rallye
-		if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
-			// Add more bonus points here
-			$USE = '(0';
-			if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
-			if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`';
-			if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`';
-			if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`';
-			if (getConfig('bonus_ref_yn')   == 'Y') $USE .= ' + `bonus_ref`';
-			$USE .= ')';
-		} else {
-			// Old version ???
-			$USE = 'turbo_bonus';
-		}
+		// Get more columns
+		$add = runFilterChain('add_bonus_points_user_columns', '');
+
+		// Active rallye, so add more point columns, if not empty
+		$USE = '`turbo_bonus`';
+		if (!empty($add)) {
+			$USE = '(0' . $add . ')';
+		} // END - if
 
 		// Init variable
 		$lastOnline = '';
@@ -347,7 +341,7 @@ ORDER BY
 		// Autopurge installed?
 		if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) {
 			// Use last online timestamp to keep inactive members away from here
-			$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
+			$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
 		} // END - if
 
 		addSql("SELECT
@@ -376,7 +370,7 @@ ORDER BY
 		// Autopurge installed?
 		if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) {
 			// Use last online timestamp to keep inactive members away from here
-			$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
+			$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
 		} // END - if
 
 		addSql("SELECT
@@ -408,7 +402,7 @@ ORDER BY
 	} // END - if
 
 	//
-	// All referal banner
+	// All referral banner
 	//
 	addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC');
 	$WHATs[] = 'refbanner';
@@ -416,7 +410,7 @@ ORDER BY
 	$TITLEs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL_TITLE--}';
 
 	//
-	// All activated referal banner
+	// All activated referral banner
 	//
 	addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y' ORDER BY `id` ASC");
 	$WHATs[] = 'refbanner';