X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fpurge%2Fpurge-inact.php;h=da6b87a34e22b451430c3cef7defe743b38c1857;hb=7052cc3bd3ca07281078acbbce6ce595d753def1;hp=917ff93dd157f18438735df9bf227c0368a05daf;hpb=964a3b539e335f6d70e7779630fd3d25fd38398d;p=mailer.git

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index 917ff93dd1..da6b87a34e 100644
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Abort if autopurge is not active or disabled by admin
 if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
 	// Abort here
-	return false;
+	return FALSE;
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
@@ -53,37 +53,40 @@ if (isAutopurgeInactiveEnabled()) {
 
 	// Init exclusion list
 	// @TODO Rewrite these if() blocks to a filter
-	$EXCLUDE_LIST = '';
-	if (isValidUserId(getDefRefid())) $EXCLUDE_LIST .= ' AND `userid` != {?def_refid?}';
+	$excludeUserids = '';
+	if (isValidUserId(getDefRefid())) $excludeUserids .= ' AND `userid` != {?def_refid?}';
 
 	// Check for more extensions
-	if (isExtensionActive('beg'))     $EXCLUDE_LIST .= ' AND `userid` != {?beg_userid?}';
-	if (isExtensionActive('bonus'))   $EXCLUDE_LIST .= ' AND `userid` != {?bonus_userid?}';
-	if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND `userid` != {?doubler_userid?}';
+	if (isExtensionActive('beg'))     $excludeUserids .= ' AND `userid` != {?beg_userid?}';
+	if (isExtensionActive('bonus'))   $excludeUserids .= ' AND `userid` != {?bonus_userid?}';
+	if (isExtensionActive('doubler')) $excludeUserids .= ' AND `userid` != {?doubler_userid?}';
 
 	// Check for new holiday extension
 	if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 		// Include only users with no active holiday
-		$EXCLUDE_LIST .= " AND `holiday_active`='N'";
+		$excludeUserids .= " AND `holiday_active`='N'";
 	} // END - if
 
 	// Check for all accounts
 	$result_inactive = SQL_QUERY("SELECT
-	`userid`, `email`, `last_online`
+	`userid`,
+	`email`,
+	`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`status`='CONFIRMED' AND
+	`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . " AND
 	(UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?}
-	" . $EXCLUDE_LIST . "
+	" . $excludeUserids . "
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
 	if (!SQL_HASZERONUMS($result_inactive)) {
 		// Prepare variables and constants...
-		$useridsContent = '';
+		$userids = array();
 		$content['since'] = (getApInactiveSince() / 60 / 60);
 		$content['time']  = (getApInactiveTime()  / 60 / 60);
 
@@ -93,25 +96,25 @@ ORDER BY
 			$content = merge_array($content, $row);
 
 			// Remember userids for the admin
-			$useridsContent .= $content['userid'] . ', ';
+			array_push($userids, $content['userid']);
 
 			// Get date/time from timestamp
 			$content['last_online'] = generateDateTime($content['last_online'], 0);
 
 			// Load mail template
 			$message = loadEmailTemplate('member_autopurge_inactive', $content, bigintval($content['userid']));
-			sendEmail($content['email'], '{--MEMBER_AUTOPURGE_INACTIVE_SUBJECT--}', $message);
+			sendEmail($content['userid'], '{--MEMBER_AUTOPURGE_INACTIVE_SUBJECT--}', $message);
 
 			// Update this account
 			addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
-				array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+				array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));
 		} // END - while
 
 		// Remove last comma
-		$useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
+		$content['userids'] = implode(PHP_EOL, $userids);
 
 		// Send mail notification to admin
-		sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $useridsContent);
+		sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $content);
 	} // END - if
 
 	// Free memory
@@ -120,15 +123,19 @@ ORDER BY
 	// Now let's have a look for inactive accounts we want to delete we newly use the same exclude list
 	// here for e.g. excluding holiday users
 	$result_inactive = SQL_QUERY("SELECT
-	`userid`, `email`, `last_online`
+	`userid`,
+	`email`,
+	`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`status`='CONFIRMED' AND
+	`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . " AND
 	(UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
-	(UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_time?}
-" . $EXCLUDE_LIST . "
+	(UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_time?} AND
+	`ap_notified` > 0
+" . $excludeUserids . "
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
@@ -139,7 +146,7 @@ ORDER BY
 		// Delete inactive accounts
 		while ($content = SQL_FETCHARRAY($result_inactive)) {
 			// Remember userids for the admin
-			$useridsContent[] = $content['userid'];
+			array_push($userids, $content['userid']);
 
 			// Get date/time from timestamp
 			$content['last_online'] = generateDateTime($content['last_online'], 0);
@@ -149,7 +156,7 @@ ORDER BY
 		} // END - while
 
 		// Display all userids
-		$useridsContent = implode("\n", $userids);
+		$useridsContent = implode(PHP_EOL, $userids);
 
 		// Send mail notification to admin
 		if (getConfig('ap_in_notify') == 'Y') {