A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[mailer.git] / inc / modules / admin / what-list_autopurge.php

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index fffc66ef86f0883aba2f94f88e375a8ae7cb13a9..83de762679c8b0da0c296dc6a541071fe75ce744 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -47,6 +47,7 @@ if (getConfig('def_refid') > 0) {
 } // 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')."";
@@ -57,25 +58,29 @@ $result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.gender, d.surname, d.family
 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(getConfig('ap_inactive_since'), getConfig('ap_inactive_since'), getConfig('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
@@ -85,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, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));
 }
+
 //
 ?>