X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=09cde0c7f56fc398f58ba6d9316d0472ba0f1705;hb=7c15ca79161bf475e958810a5b585bce869a2af9;hp=dd93f3ba035637b9bfd4d80235f76b2604ac7af8;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index dd93f3ba03..09cde0c7f5 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -17,7 +17,7 @@
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,13 +37,12 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Exclude default referal id if set
 $EXCLUDE_LIST = '';
@@ -53,17 +52,24 @@ if (getConfig('def_refid') > 0) {
 
 // Check for more extensions
 // @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'";
+if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_userid')."";
+if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_userid')."";
+if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
+if (isExtensionInstalledAndNewer('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)
-".$EXCLUDE_LIST."
-ORDER BY d.userid",
+$result = SQL_QUERY_ESC("SELECT
+	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)
+	".$EXCLUDE_LIST."
+ORDER BY
+	d.userid ASC",
 	array(
 		getConfig('ap_inactive_since'),
 		getConfig('ap_inactive_since'),
@@ -75,35 +81,34 @@ if (SQL_NUMROWS($result) > 0) {
 	$OUT = ''; $SW = 2;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the row template
-		// @TODO Rewritings: sname->surname,fname->family in templates
+		// @TODO Rewritings: surname->surname,family->family in templates
 		$content = array(
-			'sw'       => $SW,
-			'uid'      => generateUserProfileLink($content['userid']),
-			'gender'   => translateGender($content['gender']),
-			'sname'    => $content['surname'],
-			'fname'    => $content['family'],
-			'email'    => "<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".$content['email']."</a>",
-			'joined'   => generateDateTime($content['joined'], "2"),
-			'last'     => generateDateTime($content['last_online'], "2"),
-			'notified' => generateDateTime($content['ap_notified'], "2"),
+			'sw'          => $SW,
+			'userid'      => generateUserProfileLink($content['userid']),
+			'gender'      => translateGender($content['gender']),
+			'surname'     => $content['surname'],
+			'family'      => $content['family'],
+			'email'       => "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['email']."</a>",
+			'joined'      => generateDateTime($content['joined'], 2),
+			'last_online' => generateDateTime($content['last_online'], 2),
+			'notified'    => generateDateTime($content['ap_notified'], 2),
 		);
 
 		// Load row template
-		$OUT .= LOAD_TEMPLATE("admin_list_autopurge_row", true, $content);
+		$OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
 		$SW = 3 - $SW;
 	}
 
 	// Free memory
 	SQL_FREERESULT($result);
-	// @TODO Rewrite this constant
-	define('__AUTOPURGE_ROWS', $OUT);
+	$content['rows'] = $OUT;
 
 	// Load main template
-	LOAD_TEMPLATE("admin_list_autopurge");
+	loadTemplate('admin_list_autopurge', false, $content);
 } else {
 	// All members are active or you don't have any registered
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
 }
 
-//
+// [EOF]
 ?>