X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=3d90337c23a286a42addf19b866e9281a4a77aa8;hb=be79afde3071dfc4d6fe845ddb75abf13534eadb;hp=96355fa9ce87d9db026064103452239b1a84be91;hpb=e0f043fedf0493fcadb693bd89425d6f5fedc8ed;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 96355fa9ce..3d90337c23 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -67,7 +67,7 @@ function outputAdvancedOverview (&$result_main) {
 	foreach (
 		array(
 			// Member accounts
-			'confirmed_members','unconfirmed_members','locked_members',
+			'confirmed_members','unconfirmed_members','locked_members','random_refid',
 			// Tasks
 			'update_tasks','new_tasks','closed_tasks','your_tasks','deleted_tasks','solved_tasks',
 			// Mail orders
@@ -102,16 +102,23 @@ function outputAdvancedOverview (&$result_main) {
 	$value = getTotalUnconfirmedUser();
 
 	if ($value > 0) {
-		$content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=chk_regs%}">' . $value . '</a>';
+		$content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=UNCONFIRMED%}">' . $value . '</a>';
 	} // END - if
 
-
 	// And locked accounts
 	$value = getTotalLockedUser();
 	if ($value > 0) {
 		$content['locked_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=locked%}">' . $value . '</a>';
 	} // END - if
 
+	if (isExtensionInstalledAndNewer('user', '0.3.4')) {
+		// And random refid
+		$value = getTotalRandomRefidUser();
+		if ($value > 0) {
+			$content['random_refid'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;mode=random_refid%}">' . $value . '</a>';
+		} // END - if
+	} // END - if
+
 	//
 	// Unassigned tasks
 	//
@@ -206,7 +213,7 @@ function outputAdvancedOverview (&$result_main) {
 				$content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 			} // END - if
 		} elseif (isExtensionActive('bonus')) {
-			$content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
+			$content['purged_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}';
 		} else {
 			$content['purged_bonus_mails'] = '<span class="notice">{--ADMIN_EXTENSION_BONUS_404--}</span>';
 		}
@@ -226,7 +233,7 @@ function outputAdvancedOverview (&$result_main) {
 			$content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 		} // END - if
 	} elseif (isExtensionActive('bonus')) {
-		$content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
+		$content['send_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}';
 	} else {
 		$content['send_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
 	}
@@ -267,7 +274,7 @@ 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");
+		addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 OR `refid` IS NULL ORDER BY `userid` ASC");
 		$DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}';
 		$WHATs[]  = 'list_user&amp;mode=norefs';
@@ -283,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
@@ -291,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
@@ -299,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
@@ -307,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
@@ -319,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 = '';
@@ -340,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
@@ -369,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