X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=b496e1df1f7b4848307ee91792c0ce73fcec5db9;hb=aa838f04c6d825f706e3c7e27e3e1aa8bbd9ebb2;hp=76d794d9cc2371d4946473f897d1d650101177b6;hpb=ad851a23313d8ac6489a759a0f3d62e3bc6f4682;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 76d794d9cc..b496e1df1f 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -62,7 +62,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 
 	if (!$JOBS_DONE) {
 		// New extensions or updates found
-		$value = GET_TOTAL_DATA(GET_ADMIN_ID(get_session('admin_login')), "task_system", "id", "assigned_admin", true, " AND status='NEW' AND task_type='EXTENSION_UPDATE'");
+		$value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status='NEW' AND task_type='EXTENSION_UPDATE'");
 
 		if ($value > 0) {
 			define('__TASK_UPDATE_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</A>");
@@ -139,7 +139,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	//
 	// Solved tasks
 	//
-	$value = GET_TOTAL_DATA("CLOSED", "task_system", "id", "status", true, sprintf(" AND assigned_admin=%s", GET_ADMIN_ID(get_session('admin_login'))));
+	$value = GET_TOTAL_DATA("SOLVED", "task_system", "id", "status", true, sprintf(" AND assigned_admin=%s", GET_CURRENT_ADMIN_ID()));
 
 	if ($value > 0) {
 		define('__TASK_SOLVED_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</A>");
@@ -150,7 +150,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	//
 	// Your tasks
 	//
-	$value = GET_TOTAL_DATA(GET_ADMIN_ID(get_session('admin_login')), "task_system", "id", "assigned_admin", true, " AND status = 'NEW' AND task_type != 'EXTENSION_UPDATE'");
+	$value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status = 'NEW' AND task_type != 'EXTENSION_UPDATE'");
 
 	if ($value > 0) {
 		define('__TASK_YOUR_VALUE', "<A href=\"".URL."/modules.php?module=admin&amp;what=list_task\">".$value."</A>");
@@ -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