unneccessary globals removed

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 730812bf897d06b814a334c9ea8fd59d2e74063b..53f8feb9a8d9735ce4e4ede3841cccd224474180 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -46,7 +46,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 //
 function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 {
-       global $_COOKIE, $CONFIG;
+       global $_CONFIG;
 
        // Init variables/arrays
        $EXTRAS = ""; $OUT = ""; $SQLs = array(); $WHATs = array(); $DESCRs = array(); $TITLEs = array();
@@ -57,7 +57,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        if (!$JOBS_DONE) {
                // New extensions or updates found
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin='%s' AND status='NEW' AND task_type='EXTENSION_UPDATE'",
-                array(GET_ADMIN_ID($_COOKIE['admin_login'])), __FILE__, __LINE__);
+                array(GET_ADMIN_ID($_SESSION['admin_login'])), __FILE__, __LINE__);
 
                $value = SQL_NUMROWS($result);
                SQL_FREERESULT($result);
@@ -150,7 +150,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        // Solved tasks
        //
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE status = 'SOLVED' AND assigned_admin='%s'",
-        array(GET_ADMIN_ID($_COOKIE['admin_login'])), __FILE__, __LINE__);
+        array(GET_ADMIN_ID($_SESSION['admin_login'])), __FILE__, __LINE__);
        $value = SQL_NUMROWS($result);
        SQL_FREERESULT($result);
 
@@ -164,7 +164,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        // Your tasks
        //
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin='%s' AND status = 'NEW' AND task_type != 'EXTENSION_UPDATE'",
-        array(GET_ADMIN_ID($_COOKIE['admin_login'])), __FILE__, __LINE__);
+        array(GET_ADMIN_ID($_SESSION['admin_login'])), __FILE__, __LINE__);
        $value = SQL_NUMROWS($result);
        SQL_FREERESULT($result);
 
@@ -271,7 +271,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 
        if (EXT_IS_ACTIVE("autopurge")) {
                // Start finding them...
-               $since = (time() - $CONFIG['ap_in_since']);
+               $since = (time() - $_CONFIG['ap_in_since']);
                $EXCLUDE_LIST = " AND d.userid != c.def_refid";
 
                // Check for more extensions
@@ -336,11 +336,11 @@ ORDER BY d.userid";
                if (GET_EXT_VERSION("bonus") >= "0.6.9") {
                        // Add more bonus points here
                        $USE = "(0";
-                       if ($CONFIG['bonus_click_yn'] == 'Y') $USE .= " + turbo_bonus";
-                       if ($CONFIG['bonus_login_yn'] == 'Y') $USE .= " + login_bonus";
-                       if ($CONFIG['bonus_order_yn'] == 'Y') $USE .= " + bonus_order";
-                       if ($CONFIG['bonus_stats_yn'] == 'Y') $USE .= " + bonus_stats";
-                       if ($CONFIG['bonus_ref_yn']   == 'Y') $USE .= " + bonus_ref";
+                       if ($_CONFIG['bonus_click_yn'] == 'Y') $USE .= " + turbo_bonus";
+                       if ($_CONFIG['bonus_login_yn'] == 'Y') $USE .= " + login_bonus";
+                       if ($_CONFIG['bonus_order_yn'] == 'Y') $USE .= " + bonus_order";
+                       if ($_CONFIG['bonus_stats_yn'] == 'Y') $USE .= " + bonus_stats";
+                       if ($_CONFIG['bonus_ref_yn']   == 'Y') $USE .= " + bonus_ref";
                        $USE .= ")";
                } else {
                        // Old version ???
@@ -349,10 +349,10 @@ ORDER BY d.userid";
 
                // Autopurge installed?
                $LAST = ""; $ONLINE = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == 'Y') && ($CONFIG['ap_in_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == 'Y') && ($_CONFIG['ap_in_since'] > 0)) {
                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = " AND last_online >= ";
-                       $ONLINE = bigintval(time() - $CONFIG['ap_in_since']);
+                       $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']);
                }
 
                $SQLs[]   = "SELECT ".$USE." AS active_bonus FROM "._MYSQL_PREFIX."_user_data
@@ -368,10 +368,10 @@ ORDER BY active_bonus DESC, userid";
 
                // Autopurge installed?
                $LAST = ""; $ONLINE = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == 'Y') && ($CONFIG['ap_in_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == 'Y') && ($_CONFIG['ap_in_since'] > 0)) {
                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = " AND last_online >= ";
-                       $ONLINE = bigintval(time() - $CONFIG['ap_in_since']);
+                       $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']);
                }
 
                $SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_data