X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=d823fd4676e2393291a5e4d31139c963f70a04d8;hb=45465772fed386cbfa0c1df9677cbd9134ac5819;hp=2ffdeee1f7d3c2b72692c2cd84957ede3b35d330;hpb=b8820fdf130928891415ee6caebfc75a666c64e5;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 2ffdeee1f7..d823fd4676 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -38,8 +38,6 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
-	global $cacheArray;
-
 	// First check for solved and not assigned tasks and assign them to current admin
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'",
 		array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
@@ -49,7 +47,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 	$JOBS_DONE = true;
 
 	// Open the extension directory
-	$handle = opendir(PATH."inc/extensions/") or mxchange_die("Cannot read extension directory!");
+	$handle = opendir(constant('PATH')."inc/extensions/") or mxchange_die("Cannot read extension directory!");
 	while ($file = readdir($handle)) {
 		// Is this file an extension?
 		if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) {
@@ -84,9 +82,9 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 					EXTENSION_UPDATE($ext_name, $ext_ver);
 				} // END - if
 
-				if (isset($cacheArray['active_extensions'][$ext_name])) {
+				if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
 					// Maybe we want to keept the current extension active?
-					if (($cacheArray['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
+					if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
 						// Reactivate this extension!
 						ACTIVATE_EXTENSION($ext_name);
 					} // END - if
@@ -155,14 +153,14 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				} // END - if
 
 				// Decode entities of the text
-				$text = html_entity_decode($text);
+				$text = decodeEntities($text);
 
 				// Compile and insert text from task into table template
 				$text = LOAD_TEMPLATE("admin_extensions_text", true, $text);
 
 				// Initialize variables (no title for SQL commands by default)
 				$ext_name = "";
-				$title = TASK_NO_TITLE;
+				$title = getMessage('TASK_NO_TITLE');
 
 				// Shall I list SQL commands assigned to an extension installation or update task?
 				if (((GET_EXT_VERSION("sql_patches") != '') && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
@@ -175,7 +173,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						$text .= $NOTES;
 
 						// Set title
-						$title = ADMIN_SQLS_EXECUTED_ON_REGISTER;
+						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
 					} elseif ($type == "EXTENSION_UPDATE") {
 						// Prepare extension name and version
 						$ext_name = substr($ext_name, 7);
@@ -191,7 +189,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						$text .= $NOTES;
 
 						// Set title
-						$title = ADMIN_SQLS_EXECUTED_ON_UPDATE;
+						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
 					} else {
 						// Remove extension's name
 						$ext_name = "";
@@ -230,7 +228,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				case "EXTENSION": // Install new extensions
 					$ext_name = substr($subj, 1, strpos($subj, ":") - 1);
 					$result_lines = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-					 array($ext_name), __FILE__, __LINE__);
+						array($ext_name), __FILE__, __LINE__);
 					$lines = SQL_NUMROWS($result_lines);
 					SQL_FREERESULT($result_lines);
 					if ($lines == "0") {
@@ -263,6 +261,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					break;
 
 				case "SUPPORT_MEMBER": // Assign on member's support request
+					// @TODO This may also be rewritten to include files
 					switch ($mode)
 					{
 					default: // @TODO Unknown support mode