X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=57b6a3f8bc81d8169c5e1d1c74ef76c9771ac8d2;hb=9e604ce404fe7d2d8dafc259a5fb8cd826aec5e6;hp=5c554718bdca6de8db13d57823e48846e6d67bf4;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7;p=mailer.git

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 5c554718bd..57b6a3f8bc 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Inaktive Accounts finden und dann auflisten      *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -38,32 +38,39 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$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);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Exclude default referal id if set
-$EXCLUDE_LIST = "";
+$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 (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 (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)
-".$EXCLUDE_LIST."
-ORDER BY d.userid",
+$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 ASC",
 	array(
 		getConfig('ap_inactive_since'),
 		getConfig('ap_inactive_since'),
@@ -72,24 +79,24 @@ ORDER BY d.userid",
 
 if (SQL_NUMROWS($result) > 0) {
 	// Ok, we have found some inactive accounts
-	$OUT = ""; $SW = 2;
+	$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($content['userid']),
-			'gender'   => TRANSLATE_GENDER($content['gender']),
+			'uid'      => generateUserProfileLink($content['userid']),
+			'gender'   => translateGender($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"),
+			'email'    => "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['email']."</a>",
+			'joined'   => generateDateTime($content['joined'], '2'),
+			'last'     => generateDateTime($content['last_online'], '2'),
+			'notified' => generateDateTime($content['ap_notified'], '2'),
 		);
 
 		// Load row template
-		$OUT .= LOAD_TEMPLATE("admin_list_autopurge_row", true, $content);
+		$OUT .= LOAD_TEMPLATE('admin_list_autopurge_row', true, $content);
 		$SW = 3 - $SW;
 	}
 
@@ -99,10 +106,10 @@ if (SQL_NUMROWS($result) > 0) {
 	define('__AUTOPURGE_ROWS', $OUT);
 
 	// Load main template
-	LOAD_TEMPLATE("admin_list_autopurge");
+	LOAD_TEMPLATE('admin_list_autopurge');
 } else {
 	// All members are active or you don't have any registered
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
+	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
 }
 
 //