Templates added if user retreats an URL, tpos fixed

[mailer.git] / inc / libs / task_functions.php

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 2b34fa214c31b1c3dbe221b980c2baf20c4495d7..b7c91c62ca47248a999178a92b7957fa8c1f2a08 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -81,7 +81,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        SQL_FREERESULT($result);
 
        if ($value > 0) {
-               define('__CONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;mode=confirmed\">".$value."</A>");
+               define('__CONFIRMED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</A>");
        } else {
                define('__CONFIRMED_VALUE', "0");
        }
@@ -103,7 +103,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        SQL_FREERESULT($result);
 
        if ($value > 0) {
-               define('__LOCKED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;mode=locked\">".$value."</A>");
+               define('__LOCKED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</A>");
        } else {
                define('__LOCKED_VALUE', "0");
        }
@@ -273,7 +273,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        if (EXT_IS_ACTIVE("autopurge")) {
                // Start finding them...
                $since = $_CONFIG['ap_inactive_since'];
-               $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid']."";
+               $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 != ".$_CONFIG['beg_uid']."";
@@ -284,7 +287,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                // Check for all accounts
                $SQLs[] = "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() - ".$since.") AND d.last_online < ".$since." AND d.ap_notified < ".$since."
+WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < (UNIX_TIMESTAMP() - ".$since.") AND d.ap_notified < (UNIX_TIMESTAMP() - ".$since.")
 ".$EXCLUDE_LIST."
 ORDER BY d.userid";
                $WHATs[]  = "list_autopurge";
@@ -297,7 +300,7 @@ ORDER BY d.userid";
                $SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE refid='0' ORDER BY userid";
                $DESCRs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF;
                $TITLEs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF_TITLE;
-               $WHATs[]  = "list_norefs";
+               $WHATs[]  = "list_user&amp;mode=norefs";
        }
 
        if (EXT_IS_ACTIVE("payout")) {