Fixed different results in admin overview page and inactivity list

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index ee36736c0036c2bd185df5f27a908f473d869237..eb72904f371b1ca99a2b0ed9f9d3f0b55bb91bfd 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -32,37 +32,42 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
+} // END - if
 
 // Abort if autopurge is not active or disabled by admin
 if ((!EXT_IS_ACTIVE("autopurge")) || ($_CONFIG['auto_purge_active'] == "N")) {
        // Abort here
        return false;
-}
+} // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
-if ($_CONFIG['ap_inactive'] == "Y") {
+if ($_CONFIG['autopurge_inactive'] == "Y") {
        // Ok, let's have a look...
-       $since = bigintval($_CONFIG['ap_in_since']);
-       $EXCLUDE_LIST = " AND d.userid != c.def_refid";
+       $since = bigintval($_CONFIG['ap_inactive_since']);
+
+       // Init exclusion list
+       $EXCLUDE_LIST = "";
+       if ($_CONFIG['def_refid'] > 0) {
+               $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['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 != ".$_CONFIG['beg_uid']."";
+       if (EXT_IS_ACTIVE("bonus"))   $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['bonus_uid']."";
+       if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['doubler_uid']."";
 
        // Check for new holiday extension
        if (GET_EXT_VERSION("holiday") >= "0.1.3") {
                // Include only users with no active holiday
-               $EXCLUDE_LIST .= " AND d.holiday_active = 'N'";
+               $EXCLUDE_LIST .= " AND d.holiday_active='N'";
        } // END - if
 
        // 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, "._MYSQL_PREFIX."_config AS c
+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__);
@@ -70,7 +75,7 @@ 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_in_since'] / 60 / 60));
+               define('__INACTIVE_SINCE', ($_CONFIG['ap_inactive_since'] / 60 / 60));
                define('__INACTIVE_TIME' , ($_CONFIG['ap_in_time']  / 60 / 60));
 
                // Mark found accounts as inactive and send an email
@@ -104,7 +109,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
        // here for e.g. excluding holiday users
        $time = bigintval($_CONFIG['ap_in_time']);
        $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
-FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c
+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",