reading and checking for session variables rewritten

[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 ce0ccaaaf5f378275e44c1ab028124473f170eb4..fb0f2f2c266d9c00aefdd047c527612a9baaff14 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);
@@ -163,7 +163,7 @@ if (!empty($_GET['reg_ext'])) {
                // Free the result
                SQL_FREERESULT($result);
 
-               if ($CONFIG['verbose_sql']) {
+               if ($_CONFIG['verbose_sql']) {
                        // Load SQL commands in remove mode
                        $EXT_LOAD_MODE = "remove";
                        $file = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name);
@@ -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);
@@ -277,12 +277,12 @@ case "overview": // List all registered extensions
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</FONT>");
        }
        // Link for checking for new or updated extensions
-       OUTPUT_HTML("<BR><A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">".ADMIN_SEARCH_NEW_EXTENSIONS."</A>");
+       OUTPUT_HTML("<br /><A href=\"".URL."/modules.php?module=admin&amp;what=extensions&amp;do=search\">".ADMIN_SEARCH_NEW_EXTENSIONS."</A>");
        break;
 
 case "register": // Register new extension
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin='%s' AND task_type='EXTENSION' LIMIT 1",
-        array(bigintval(GET_ADMIN_ID($_COOKIE['admin_login']))), __FILE__, __LINE__);
+        array(bigintval(GET_ADMIN_ID(get_session('admin_login')))), __FILE__, __LINE__);
        $task_found = SQL_NUMROWS($result);
 
        // Free result
@@ -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...
@@ -422,7 +422,7 @@ case "search": // Search for new extensions on our server
                                        'link'    => $LINK,
                                        'last'    => MAKE_DATETIME($EXT_SEARCH['fctime'][$id], "2"),
                                        'size'    => TRANSLATE_COMMA(round($EXT_SEARCH['fsize'][$id] / 1.024) / 1000),
-                                       'info'    => stripslashes($EXT_SEARCH['infos'][$id]),
+                                       'info'    => $EXT_SEARCH['infos'][$id],
                                );
 
                                // Load row template add current size to total size and switch color