X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-inact.php;h=a6fc4fc347f230b1ced331fa34ffdbc6006bc51c;hp=c5dca2914104ff27d4f4c9325419cdc8a8f9ba7a;hb=fc162164725588cf75969f707faead9c9cd8e68b;hpb=a090e351c49fe021fb3064325694da03402332e0

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index c5dca29141..a6fc4fc347 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/14/2008 *
- * ===============                              Last change: 09/14/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/14/2008 *
+ * ===================                          Last change: 09/14/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : purge-inactive.php                               *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,12 +39,11 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+	die();
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
@@ -51,63 +51,75 @@ if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
 // Shall I look for inactive accounts and autopurge inactive accounts?
 if (getConfig('autopurge_inactive') == 'Y') {
 	// Init SQLs
-	INIT_SQLS();
-
-	// Ok, let's have a look...
-	$since = getConfig(('ap_inactive_since'));
+	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');
+		$EXCLUDE_LIST = ' AND d.`userid` != {?def_refid?}';
 	} // END - if
 
 	// Check for more extensions
-	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 (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?}';
 
 	// Check for new holiday extension
-	if (GET_EXT_VERSION('holiday') >= '0.1.3') {
+	if (isExtensionInstalledAndNewer('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
-	$result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online
-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($since, $since, $since), __FILE__, __LINE__);
+	$result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
+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_inactive) > 0) {
 		// Prepare variables and constants...
-		$UIDs = '';
-		define('__INACTIVE_SINCE', (getConfig('ap_inactive_since') / 60 / 60));
-		define('__INACTIVE_TIME' , (getConfig('ap_in_time')  / 60 / 60));
+		$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 ($row = SQL_FETCHARRAY($result_inactive)) {
+			// Merge both arrays
+			$content = merge_array($content, $row);
+
 			// Remember userids for the admin
-			$UIDs .= $content['userid'].", ";
+			$useridsContent .= $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);
+			$message = loadEmailTemplate('member_autopurge_inactive', $content, bigintval($content['userid']));
+			sendEmail($content['email'], '{--AUTOPURGE_MEMBER_INACTIVE_SUBJECT--}', $message);
 
 			// Update this account
-			ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+			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));
 		} // 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
-		SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), "admin_autopurge_inactive", $UIDs, '');
+		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent);
 	} // END - if
 
 	// Free memory
@@ -115,35 +127,41 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 
 	// 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
-	$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)
+	$result_inactive = SQL_QUERY("SELECT
+	d.userid, d.email, d.last_online
+FROM
+	`{?_MYSQL_PREFIX?}_user_data` AS d
+WHERE
+	`status`='CONFIRMED' AND
+	`joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+	`last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+	`ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_time?})
 ".$EXCLUDE_LIST."
-ORDER BY userid",
-		array($since, $since, $time), __FILE__, __LINE__);
+ORDER BY
+	`userid` ASC", __FILE__, __LINE__);
+
 	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'] = 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'], loadEmailTemplate('member_autopurge_delete', $content['last_online'], ''));
 		} // 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') {
-			SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), "admin_autopurge_delete", $UIDs, '');
+			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent);
 		} // END - if
 	} // END - if
 
@@ -154,5 +172,5 @@ ORDER BY userid",
 	runFilterChain('run_sqls');
 } // END - if
 
-//
+// [EOF]
 ?>