X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=485ffb45d3cad090b70e3f1a42bd04574bc442f6;hb=fb573d4c3d981d52fd969a6d7167d8dc839be688;hp=e7d72d4dfe8ea263f64a7d32d88d8c0be3ad374b;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index e7d72d4dfe..485ffb45d3 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -14,12 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 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,62 +41,50 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referal id if set
-$EXCLUDE_LIST = '';
-if (getConfig('def_refid') > 0) {
-	$EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid')."";
-} // END - if
-
-// Check for more extensions
 // @TODO Rewrite those lines to filter
-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'";
+$EXCLUDE_LIST = '';
+if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
+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?}';
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
 
 // Check for all accounts
-$result = SQL_QUERY_ESC("SELECT
-	d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
+$result = SQL_QUERY("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)
+	(UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND
+	(UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND
+	(UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?}
 	".$EXCLUDE_LIST."
 ORDER BY
-	d.userid ASC",
-	array(
-		getConfig('ap_inactive_since'),
-		getConfig('ap_inactive_since'),
-		getConfig('ap_inactive_since')
-	), __FILE__, __LINE__);
+	d.`userid` ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Ok, we have found some inactive accounts
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the row template
-		// @TODO Rewritings: surname->surname,family->family in templates
 		$content = array(
-			'sw'          => $SW,
-			'userid'      => generateUserProfileLink($content['userid']),
-			'gender'      => translateGender($content['gender']),
+			'userid'      => $content['userid'],
+			'gender'      => $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),
+			'ap_notified' => generateDateTime($content['ap_notified'], 2),
 		);
 
 		// Load row template
 		$OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
-		$SW = 3 - $SW;
-	}
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
@@ -108,7 +94,7 @@ if (SQL_NUMROWS($result) > 0) {
 	loadTemplate('admin_list_autopurge', false, $content);
 } else {
 	// All members are active or you don't have any registered
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
+	displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
 }
 
 // [EOF]