X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-inact.php;h=285a3abc784828f5d804bc4354af0a909b237ec0;hp=9d630b20583f9ef5374fcf727425bc4eb81c6519;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=116747e4dba29e9e2e4daa82c45d8bbb302e9378

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 9d630b2058..285a3abc78 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -70,7 +70,7 @@ if (getConfig('autopurge_inactive') == 'Y') {
 	// Check for new holiday extension
 	if (GET_EXT_VERSION('holiday') >= '0.1.3') {
 		// Include only users with no active holiday
-		$EXCLUDE_LIST .= " AND d.holiday_active='N'";
+		$EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
 	} // END - if
 
 	// Check for all accounts
@@ -92,11 +92,11 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 			$UIDs .= $content['userid'].", ";
 
 			// Get date/time from timestamp
-			$content['last_online'] = MAKE_DATETIME($content['last_online'], "0");
+			$content['last_online'] = generateDateTime($content['last_online'], '0');
 
 			// Load mail template
 			$msg = LOAD_EMAIL_TEMPLATE("member_autopurge_inactive", $content['last_online'], bigintval($content['userid']));
-			SEND_EMAIL($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $msg);
+			sendEmail($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $msg);
 
 			// Update this account
 			ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
@@ -107,7 +107,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 		$UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
 		// Send mail notification to admin
-		SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), "admin_autopurge_inactive", $UIDs, '');
+		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), "admin_autopurge_inactive", $UIDs, '');
 	} // END - if
 
 	// Free memory
@@ -118,9 +118,9 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 	$time = getConfig(('ap_in_time'));
 	$result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
 FROM `{!_MYSQL_PREFIX!}_user_data` AS d
-WHERE `status`='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
+WHERE `status`='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND `last_online` < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
-ORDER BY userid",
+ORDER BY `userid` ASC",
 		array($since, $since, $time), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variable...
@@ -132,10 +132,10 @@ ORDER BY userid",
 			$UIDs .= $content['userid'].", ";
 
 			// Get date/time from timestamp
-			$content['last_online'] = MAKE_DATETIME($content['last_online'], "0");
+			$content['last_online'] = generateDateTime($content['last_online'], '0');
 
 			// Finnaly delete this inactive account
-			DELETE_USER_ACCOUNT($content['userid'], LOAD_EMAIL_TEMPLATE("member_autopurge_delete", $content['last_online'], ''));
+			deleteUserAccount($content['userid'], LOAD_EMAIL_TEMPLATE("member_autopurge_delete", $content['last_online'], ''));
 		} // END - while
 
 		// Remove last comma
@@ -143,7 +143,7 @@ ORDER BY userid",
 
 		// Send mail notification to admin
 		if (getConfig('ap_in_notify') == 'Y') {
-			SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), "admin_autopurge_delete", $UIDs, '');
+			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), "admin_autopurge_delete", $UIDs, '');
 		} // END - if
 	} // END - if