Mahor rewrite:

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 310e222f7213c5cc0b8cfc20306dc1634669c514..b496e1df1f7b4848307ee91792c0ce73fcec5db9 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -246,16 +246,16 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 
        if (EXT_IS_ACTIVE("autopurge")) {
                // Start finding them...
-               $since = $_CONFIG['ap_inactive_since'];
+               $since = getConfig('ap_inactive_since');
                $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 != ".$_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']."";
+               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
@@ -326,11 +326,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 (getConfig('bonus_click_yn') == "Y") $USE .= " + turbo_bonus";
+                       if (getConfig('bonus_login_yn') == "Y") $USE .= " + login_bonus";
+                       if (getConfig('bonus_order_yn') == "Y") $USE .= " + bonus_order";
+                       if (getConfig('bonus_stats_yn') == "Y") $USE .= " + bonus_stats";
+                       if (getConfig('bonus_ref_yn')   == "Y") $USE .= " + bonus_ref";
                        $USE .= ")";
                } else {
                        // Old version ???
@@ -339,9 +339,9 @@ ORDER BY d.userid";
 
                // Autopurge installed?
                $LAST = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
                        // Use last online timestamp to keep inactive members away from here
-                       $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
+                       $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
                }
 
                $SQLs[]   = "SELECT ".$USE." AS points
@@ -358,9 +358,9 @@ ORDER BY points DESC, userid";
 
                // Autopurge installed?
                $LAST = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
                        // Use last online timestamp to keep inactive members away from here
-                       $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
+                       $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
                }
 
                $SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_data