More improved SQL queries

[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 70ccbd5f826bdbef3189d91645e43d8dd6940daf..fffc66ef86f0883aba2f94f88e375a8ae7cb13a9 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -38,31 +38,32 @@ 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";
+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)
 {
        // Ok, we have found some inactive accounts
        $SW = 2; $OUT = "";
-       while(list($uid, $gender, $sname, $fname, $email, $joined, $last, $notified) = SQL_FETCHROW($result))
+       while (list($uid, $gender, $sname, $fname, $email, $joined, $last, $notified) = SQL_FETCHROW($result))
        {
                // Prepare data for the row template
                $content = array(
@@ -71,7 +72,7 @@ if (SQL_NUMROWS($result) > 0)
                        'gender'   => TRANSLATE_GENDER($gender),
                        'sname'    => $sname,
                        'fname'    => $fname,
-                       'email'    => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
+                       '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"),
@@ -92,7 +93,7 @@ if (SQL_NUMROWS($result) > 0)
  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'));
 }
 //
 ?>