X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=bf5e18247042312dcef8e0ab19679a1275b6df6a;hp=36c06cf9c77b2a164d7474554d7968cc0bb1b8f3;hb=307a4e11763f0914e73dc756b219356e1c29ab25;hpb=60494e212a67fe360bfbb481eb4928480a6f379b

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 36c06cf9c7..bf5e182470 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,12 +55,12 @@ 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
-			$ACT = 'N'; $EXT_LOAD_MODE = "deactivate";
-			if ($active == 'N') { $ACT = 'Y'; $EXT_LOAD_MODE = "activate"; }
+			$ACT = "N"; $EXT_LOAD_MODE = "deactivate";
+			if ($active == "N") { $ACT = "Y"; $EXT_LOAD_MODE = "activate"; }
 			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='".$ACT."' WHERE id=%d AND ext_active='%s' LIMIT 1",
 			 array(bigintval($id), $active), __FILE__, __LINE__);
 
@@ -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);
@@ -111,7 +111,7 @@ if (!empty($_GET['reg_ext'])) {
 		$SW = "2"; $OUT = "";
 		foreach ($_POST['sel'] as $id=>$sel) {
 			// Edit this extension?
-			if (($sel == 'Y') || ($sel == 'N')) {
+			if (($sel == "Y") || ($sel == "N")) {
 				// Load required data
 				if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
 					$result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
@@ -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,21 +297,27 @@ 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));
 
 			// ... so we can finally register and load it in registration mode
 			$status = EXTENSION_REGISTER($ext_name, $id);
-			if ($status) {
+			if ($status == true) {
+				// Is this sql_patches? Then we need to auto-logout!
+				if ($ext_name == "sql_patches") {
+					// Auto-logout here
+					LOAD_URL("modules.php?module=admin&logout=1&sql_patches=1");
+				}
+
 				// Extension was found and successfully registered
 				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...