X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=57b6a3f8bc81d8169c5e1d1c74ef76c9771ac8d2;hp=9dbd590edf9fe5a04fd75f76f7b654fc16d43a52;hb=3f51c40f4fede87228216f9285b745a339e3891d;hpb=07612d2debcc78a93678db0deed050d82df432f1

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 9dbd590edf..57b6a3f8bc 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -56,19 +56,26 @@ if (getConfig('def_refid') > 0) {
 if (EXT_IS_ACTIVE('beg'))                  $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_uid')."";
 if (EXT_IS_ACTIVE('bonus'))                $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_uid')."";
 if (EXT_IS_ACTIVE('doubler'))              $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_uid')."";
-if (GET_EXT_VERSION('holiday') >= '0.1.3') $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+if (GET_EXT_VERSION('holiday') >= '0.1.3') $EXCLUDE_LIST .= " AND d.holiday_active='N'";
 
 // Check for all accounts
-$result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
-FROM `{!_MYSQL_PREFIX!}_user_data` AS d
-WHERE d.`status`='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
-".$EXCLUDE_LIST."
-ORDER BY d.userid",
-array(
-getConfig('ap_inactive_since'),
-getConfig('ap_inactive_since'),
-getConfig('ap_inactive_since')
-), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT DISTINCT
+	d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
+FROM
+	`{!_MYSQL_PREFIX!}_user_data` AS d
+WHERE
+	d.`status`='CONFIRMED' AND
+	d.joined < (UNIX_TIMESTAMP() - %s) AND
+	d.last_online < (UNIX_TIMESTAMP() - %s) AND
+	d.ap_notified < (UNIX_TIMESTAMP() - %s)
+	".$EXCLUDE_LIST."
+ORDER BY
+	d.userid ASC",
+	array(
+		getConfig('ap_inactive_since'),
+		getConfig('ap_inactive_since'),
+		getConfig('ap_inactive_since')
+	), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
 	// Ok, we have found some inactive accounts
@@ -82,14 +89,14 @@ if (SQL_NUMROWS($result) > 0) {
 			'gender'   => translateGender($content['gender']),
 			'sname'    => $content['surname'],
 			'fname'    => $content['family'],
-			'email'    => "<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".$content['email']."</a>",
+			'email'    => "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['email']."</a>",
 			'joined'   => generateDateTime($content['joined'], '2'),
 			'last'     => generateDateTime($content['last_online'], '2'),
 			'notified' => generateDateTime($content['ap_notified'], '2'),
 		);
 
 		// Load row template
-		$OUT .= LOAD_TEMPLATE("admin_list_autopurge_row", true, $content);
+		$OUT .= LOAD_TEMPLATE('admin_list_autopurge_row', true, $content);
 		$SW = 3 - $SW;
 	}
 
@@ -99,7 +106,7 @@ if (SQL_NUMROWS($result) > 0) {
 	define('__AUTOPURGE_ROWS', $OUT);
 
 	// Load main template
-	LOAD_TEMPLATE("admin_list_autopurge");
+	LOAD_TEMPLATE('admin_list_autopurge');
 } else {
 	// All members are active or you don't have any registered
 	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));