X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-inact.php;h=fc75e5f62b980744daa565a9a101a9806d7ba140;hb=525510c6f6ee4798619dba6236c6b6d85263ac22;hp=56fabfb73aa300ac361caa612eb8c780402c49e0;hpb=4001187f22197f55e5a1f211fc8defcc180f7c32;p=mailer.git

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 56fabfb73a..fc75e5f62b 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Auto-Loeschung von inaktiven Mitgliedern         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,18 +38,18 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
-if (getConfig('autopurge_inactive') == "Y") {
+if (getConfig('autopurge_inactive') == 'Y') {
 	// Init SQLs
 	INIT_SQLS();
 
@@ -52,20 +57,20 @@ if (getConfig('autopurge_inactive') == "Y") {
 	$since = getConfig(('ap_inactive_since'));
 
 	// Init exclusion list
-	$EXCLUDE_LIST = "";
+	$EXCLUDE_LIST = '';
 	if (getConfig('def_refid') > 0) {
 		$EXCLUDE_LIST = " AND d.userid != ".getConfig('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 (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')."";
 
 	// Check for new holiday extension
-	if (GET_EXT_VERSION("holiday") >= "0.1.3") {
+	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
@@ -77,7 +82,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variables and constants...
-		$UIDs = "";
+		$UIDs = '';
 		define('__INACTIVE_SINCE', (getConfig('ap_inactive_since') / 60 / 60));
 		define('__INACTIVE_TIME' , (getConfig('ap_in_time')  / 60 / 60));
 
@@ -87,22 +92,22 @@ 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",
-				array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+			array(bigintval($content['userid'])), __FILE__, __LINE__, false));
 		} // END - while
 
 		// Remove last comma
 		$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
@@ -113,13 +118,13 @@ 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",
-		array($since, $since, $time), __FILE__, __LINE__);
+ORDER BY `userid` ASC",
+	array($since, $since, $time), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variable...
-		$UIDs = "";
+		$UIDs = '';
 
 		// Delete inactive accounts
 		while ($content = SQL_FETCHARRAY($result_inactive)) {
@@ -127,18 +132,18 @@ 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
 		$UIDs = str_replace(", ", "\n", substr($UIDs, 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, "");
+		if (getConfig('ap_in_notify') == 'Y') {
+			sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), "admin_autopurge_delete", $UIDs, '');
 		} // END - if
 	} // END - if