X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=1d2cd22b690e3be7708ade1ab7d061062e89af8d;hb=a10f31d0ae709e41a054746a30d9e7c1e06ab5fc;hp=50b09a99bebd1d902f1f7f5d54b01cf48f6fd27e;hpb=32933a97e4462c232a794fc33bd91f01ff997cb9;p=mailer.git

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 50b09a99be..1d2cd22b69 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -48,11 +48,7 @@ addMenuDescription('admin', __FILE__);
 // Exclude default referal id if set
 // @TODO Rewrite those lines to filter
 $EXCLUDE_LIST = '';
-if (getConfig('def_refid') > 0) {
-	$EXCLUDE_LIST = ' AND d.userid != {?def_refid?}';
-} // END - if
-
-// Check for more extensions
+if (getConfig('def_refid') > 0)                $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
 if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}';
 if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}';
 if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}';
@@ -72,13 +68,12 @@ WHERE
 ORDER BY
 	d.userid ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Ok, we have found some inactive accounts
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the row template
 		$content = array(
-			'sw'          => $SW,
 			'userid'      => $content['userid'],
 			'gender'      => $content['gender'],
 			'surname'     => $content['surname'],
@@ -91,8 +86,7 @@ if (SQL_NUMROWS($result) > 0) {
 
 		// Load row template
 		$OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
-		$SW = 3 - $SW;
-	}
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
@@ -102,7 +96,7 @@ if (SQL_NUMROWS($result) > 0) {
 	loadTemplate('admin_list_autopurge', false, $content);
 } else {
 	// All members are active or you don't have any registered
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
 }
 
 // [EOF]