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

[mailer.git] / inc / modules / admin / what-extensions.php

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 0bff9ad22c1e379a7b7a78be1bc62a504b07538f..4bb2f5481bf97eeb62d291267514f366a7e2e60a 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-global $CACHE, $KEEP_ACTIVE, $CACHE_FILE;
+global $cacheInstance, $cacheArray, $cacheMode;
 
 // Normally we want the overview of all registered extensions
 $do = "overview";
@@ -55,7 +55,7 @@ if (!empty($_GET['reg_ext'])) {
        // De-/activate extensions
        foreach ($_POST['sel'] as $id=>$active) {
                // Shall we keep the extension always active?
-               if ((isset($KEEP_ACTIVE[GET_EXT_NAME($id)])) && ($KEEP_ACTIVE[GET_EXT_NAME($id)] == 'Y') && ($active == 'N')) {
+               if ((isset($cacheArray['active_extensions'][GET_EXT_NAME($id)])) && ($cacheArray['active_extensions'][GET_EXT_NAME($id)] == 'Y') && ($active == 'N')) {
                        // Keep this extension active!
                } else {
                        // De/activate extension
@@ -72,7 +72,7 @@ if (!empty($_GET['reg_ext'])) {
        // Change settings like CSS file load
        if (isset($_POST['modify'])) {
                // Change entries
-               $CACHE_UPDATE = "0";
+               $cacheInstance_UPDATE = "0";
                foreach ($_POST['sel'] as $id=>$sel) {
                        // Secure ID
                        $id = bigintval($id);
@@ -193,7 +193,7 @@ if (!empty($_GET['reg_ext'])) {
        $do = "delete";
 } elseif ((isset($_POST['remove'])) && ($SEL > 0) && (!IS_DEMO())) {
        // Remove extensions from DB (you have to delete all files manually!)
-       $CACHE_UPDATE = "0";
+       $cacheInstance_UPDATE = "0";
        foreach ($_POST['sel'] as $id=>$active) {
                // Secure ID number
                $id = bigintval($id);
@@ -297,7 +297,7 @@ case "register": // Register new extension
                SQL_FREERESULT($result);
 
                // Disable cache update by default
-               $CACHE_UPDATE = "0";
+               $cacheInstance_UPDATE = "0";
                if (!empty($subj)) {
                        // Extract extension's name from subject...
                        $ext_name = trim(substr($subj, 1, strpos($subj, ":") - 1));
@@ -309,9 +309,9 @@ case "register": // Register new extension
                                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXTENSION_REGISTERED);
 
                                // Do we need to update cache file?
-                               if ((EXT_IS_ACTIVE("cache")) && ($CACHE_FILE != "no")) {
+                               if ((EXT_IS_ACTIVE("cache")) && ($cacheMode != "no")) {
                                        // Remove cache file (will be auto-created again!)
-                                       if ($CACHE->cache_file("extensions", true)) $CACHE->cache_destroy();
+                                       if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
                                }
                        } else {
                                // Motify the admin that we have a problem here...