X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fautopurge%2Fpurge-inact.php;h=38fbc334cce7affbf04def7a52f54531c5acfc72;hb=09f5758c42a33a56bdd461c946ffe759a59c54aa;hp=a5b2b3b79c85561f5f3c5f1080c8e7311fd33d71;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index a5b2b3b79c..38fbc334cc 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,6 +54,7 @@ if (getConfig('autopurge_inactive') == 'Y') {
 	initSqls();
 
 	// Init exclusion list
+	// @TODO Rewrite these if() blocks to a filter
 	$EXCLUDE_LIST = '';
 	if (getConfig('def_refid') > 0) {
 		$EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid');
@@ -64,7 +66,7 @@ if (getConfig('autopurge_inactive') == 'Y') {
 	if (isExtensionActive('doubler')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
 
 	// Check for new holiday extension
-	if (getExtensionVersion('holiday') >= '0.1.3') {
+	if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 		// Include only users with no active holiday
 		$EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
 	} // END - if
@@ -89,14 +91,14 @@ ORDER BY
 
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variables and constants...
-		$UIDs = '';
+		$useridsContent = '';
 		$content['since'] = (getConfig('ap_inactive_since') / 60 / 60);
 		$content['time']  = (getConfig('ap_inactive_time')  / 60 / 60);
 
 		// Mark found accounts as inactive and send an email
-		while ($content = SQL_FETCHARRAY($result_inactive)) {
+		while ($content = merge_array($content, SQL_FETCHARRAY($result_inactive))) {
 			// Remember userids for the admin
-			$UIDs .= $content['userid'].", ";
+			$useridsContent .= $content['userid'].", ";
 
 			// Get date/time from timestamp
 			$content['last_online'] = generateDateTime($content['last_online'], 0);
@@ -111,10 +113,10 @@ ORDER BY
 		} // END - while
 
 		// Remove last comma
-		$UIDs = str_replace(', ', "\n", substr($UIDs, 0, -2));
+		$useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
 
 		// Send mail notification to admin
-		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $UIDs, '');
+		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent);
 	} // END - if
 
 	// Free memory
@@ -135,12 +137,12 @@ ORDER BY `userid` ASC",
 
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variable...
-		$UIDs = '';
+		$useridsContent = '';
 
 		// Delete inactive accounts
 		while ($content = SQL_FETCHARRAY($result_inactive)) {
 			// Remember userids for the admin
-			$UIDs .= $content['userid'] . ', ';
+			$useridsContent .= $content['userid'] . ', ';
 
 			// Get date/time from timestamp
 			$content['last_online'] = generateDateTime($content['last_online'], 0);
@@ -150,11 +152,11 @@ ORDER BY `userid` ASC",
 		} // END - while
 
 		// Remove last comma
-		$UIDs = str_replace(', ', "\n", substr($UIDs, 0, -2));
+		$useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
 
 		// Send mail notification to admin
 		if (getConfig('ap_in_notify') == 'Y') {
-			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $UIDs, '');
+			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent);
 		} // END - if
 	} // END - if