X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=fb0f2f2c266d9c00aefdd047c527612a9baaff14;hb=39aaaf3d3d93e5b37ac78b6bb1edab2991116a75;hp=36c06cf9c77b2a164d7474554d7968cc0bb1b8f3;hpb=c3e061c0d6fc0ee8778ebaebf1c05cf2bf126703;p=mailer.git

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 36c06cf9c7..fb0f2f2c26 100644
--- 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);
@@ -282,7 +282,7 @@ case "overview": // List all registered extensions
 
 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...