more in naming convention applied, you should better kill inc/cache/*.cache files...

[mailer.git] / inc / modules / admin / overview-inc.php

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index bea4c69967b3bce17228a93bbe516308c3b4c59a..f9314a45c5fbdfd02f2499f757ed39aca10c7eea 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 
 function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
 {
-       global $EXTENSIONS, $KEEP_ACTIVE;
+       global $cacheArray, $cacheArray;
 
        // First check for solved and not assigned tasks and assign them to current admin
        $result_task = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'",
@@ -60,15 +60,15 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
 
                        // Check if extension is installed or not
                        $ext_ver = "";
-                       if ((!is_array($EXTENSIONS['ext_version'])) || (empty($EXTENSIONS['ext_version'][$ext]))) {
+                       if ((!is_array($cacheArray['extensions']['ext_version'])) || (empty($cacheArray['extensions']['ext_version'][$ext]))) {
                                // Load data from database
                                $result = SQL_QUERY_ESC("SELECT id, ext_version FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
                                 array($ext), __FILE__, __LINE__);
                        } else {
                                // Load version from cache
-                               if (!empty($EXTENSIONS['ext_version'][$ext])) {
+                               if (!empty($cacheArray['extensions']['ext_version'][$ext])) {
                                        // Extension is installed so we can get it's version number
-                                       $ext_ver = $EXTENSIONS['ext_version'][$ext];
+                                       $ext_ver = $cacheArray['extensions']['ext_version'][$ext];
                                } else {
                                        // Extension is not installed so no version number was found
                                        $ext_ver = "";
@@ -126,7 +126,7 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
                         else
                        {
                                // Maybe we want to update?
-                               if ((empty($EXTENSIONS['ext_version'][$ext])) && (SQL_NUMROWS($result) == 1))
+                               if ((empty($cacheArray['extensions']['ext_version'][$ext])) && (SQL_NUMROWS($result) == 1))
                                {
                                        list($dummy, $ext_ver) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -135,10 +135,10 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
                                // Update extension
                                if (!empty($ext_ver)) EXTENSION_UPDATE($file, $ext, $ext_ver);
 
-                               if (!empty($KEEP_ACTIVE[$ext]))
+                               if (!empty($cacheArray['active_extensions'][$ext]))
                                {
                                        // Maybe we want to keept the current extension active?
-                                       if (($KEEP_ACTIVE[$ext] == 'Y') && (!EXT_IS_ACTIVE($ext, true, true)))
+                                       if (($cacheArray['active_extensions'][$ext] == 'Y') && (!EXT_IS_ACTIVE($ext, true, true)))
                                        {
                                                // Reactivate this extension!
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",