More improved SQL queries

[mailer.git] / inc / autopurge / purge-inact.php

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index b1d5bc92f8015bcb87cdc279fcc5197f71ab9fc4..bcf5a92470a930da4e9f3e126de39dbd898b230c 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -38,21 +38,26 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE("autopurge")) || ($_CONFIG['auto_purge_active'] == "N")) {
+if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') == "N")) {
        // Abort here
        return false;
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
-if ($_CONFIG['autopurge_inactive'] == "Y") {
+if (getConfig('autopurge_inactive') == "Y") {
        // Ok, let's have a look...
-       $since = bigintval($_CONFIG['ap_inactive_since']);
-       $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'];
+       $since = bigintval(getConfig('ap_inactive_since'));
+
+       // Init exclusion list
+       $EXCLUDE_LIST = "";
+       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')."";
 
        // Check for new holiday extension
        if (GET_EXT_VERSION("holiday") >= "0.1.3") {
@@ -62,19 +67,19 @@ if ($_CONFIG['autopurge_inactive'] == "Y") {
 
        // Check for all accounts
        $result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online
-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($since, $since, $since), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_inactive) > 0) {
                // Prepare variables and constants...
                $UIDs = "";
-               define('__INACTIVE_SINCE', ($_CONFIG['ap_inactive_since'] / 60 / 60));
-               define('__INACTIVE_TIME' , ($_CONFIG['ap_in_time']  / 60 / 60));
+               define('__INACTIVE_SINCE', (getConfig('ap_inactive_since') / 60 / 60));
+               define('__INACTIVE_TIME' , (getConfig('ap_in_time')  / 60 / 60));
 
                // Mark found accounts as inactive and send an email
-               while(list($uid, $email, $last) = SQL_FETCHROW($result_inactive)) {
+               while (list($uid, $email, $last) = SQL_FETCHROW($result_inactive)) {
                        // Remember userids for the admin
                        $UIDs .= $uid.", ";
 
@@ -86,8 +91,8 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                        SEND_EMAIL($email, AUTOPURGE_MEMBER_INACTIVE_SUBJECT, $msg);
 
                        // Update this account
-                       $result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
-                        array(bigintval($uid)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+                               array(bigintval($uid)), __FILE__, __LINE__);
                } // END - while
 
                // Remove last comma
@@ -102,10 +107,10 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 
        // Now let's have a look for inactive accounts we want to delete we newly use the same exclude list
        // here for e.g. excluding holiday users
-       $time = bigintval($_CONFIG['ap_in_time']);
+       $time = bigintval(getConfig('ap_in_time'));
        $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
-FROM "._MYSQL_PREFIX."_user_data AS d
-WHERE status='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
+FROM `{!_MYSQL_PREFIX!}_user_data` AS d
+WHERE `status`='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY userid",
         array($since, $since, $time), __FILE__, __LINE__);
@@ -129,7 +134,7 @@ ORDER BY userid",
                $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2));
 
                // Send mail notification to admin
-               if ($_CONFIG['ap_un_mail'] == "Y") {
+               if (getConfig('ap_in_notify') == "Y") {
                        SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_DELETE_SUBJECT, "admin_autopurge_delete", $UIDs, "");
                } // END - if
        } // END - if