X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=83de762679c8b0da0c296dc6a541071fe75ce744;hp=70ccbd5f826bdbef3189d91645e43d8dd6940daf;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=7f104f6fe558bb56b4205241435a2357c2feece1

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 70ccbd5f82..83de762679 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -38,43 +38,49 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Exclude default referal id if set
 $EXCLUDE_LIST = "";
-if ($_CONFIG['def_refid'] > 0) {
-	$EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid']."";
+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 != c.beg_uid";
-if (EXT_IS_ACTIVE("bonus"))   $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
-if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
+// @TODO Rewrite those lines to filter
+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 (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active='N'";
 
 // Check for all accounts
 $result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
-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)
+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($_CONFIG['ap_inactive_since'], $_CONFIG['ap_inactive_since'], $_CONFIG['ap_inactive_since']), __FILE__, __LINE__);
+ORDER BY d.userid",
+	array(
+		getConfig('ap_inactive_since'),
+		getConfig('ap_inactive_since'),
+		getConfig('ap_inactive_since')
+	), __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0)
-{
+if (SQL_NUMROWS($result) > 0) {
 	// Ok, we have found some inactive accounts
-	$SW = 2; $OUT = "";
-	while(list($uid, $gender, $sname, $fname, $email, $joined, $last, $notified) = SQL_FETCHROW($result))
-	{
+	$OUT = ""; $SW = 2;
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the row template
+		// @TODO Rewritings: sname->surname,fname->family in templates
 		$content = array(
 			'sw'       => $SW,
-			'uid'      => ADMIN_USER_PROFILE_LINK($uid),
-			'gender'   => TRANSLATE_GENDER($gender),
-			'sname'    => $sname,
-			'fname'    => $fname,
-			'email'    => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
-			'joined'   => MAKE_DATETIME($joined, "2"),
-			'last'     => MAKE_DATETIME($last, "2"),
-			'notified' => MAKE_DATETIME($notified, "2"),
+			'uid'      => ADMIN_USER_PROFILE_LINK($content['userid']),
+			'gender'   => TRANSLATE_GENDER($content['gender']),
+			'sname'    => $content['surname'],
+			'fname'    => $content['family'],
+			'email'    => "<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</a>",
+			'joined'   => MAKE_DATETIME($content['joined'], "2"),
+			'last'     => MAKE_DATETIME($content['last_online'], "2"),
+			'notified' => MAKE_DATETIME($content['ap_notified'], "2"),
 		);
 
 		// Load row template
@@ -84,15 +90,15 @@ if (SQL_NUMROWS($result) > 0)
 
 	// Free memory
 	SQL_FREERESULT($result);
+	// @TODO Rewrite this constant
 	define('__AUTOPURGE_ROWS', $OUT);
 
 	// Load main template
 	LOAD_TEMPLATE("admin_list_autopurge");
-}
- else
-{
+} else {
 	// All members are active or you don't have any registered
-	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_AUTOPURGE_ALL_ACTIVE);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
 }
+
 //
 ?>