From dca9454c1d94e075e37a5ad9b6ee9b7e7d0d5745 Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Mon, 25 Sep 2023 20:57:13 +0200
Subject: [PATCH] logout when switching multi mode

---
 core/src/main/cfml/context/admin/index.cfm  |  2 +-
 core/src/main/cfml/context/admin/logout.cfm | 21 ++++++++++++++++-----
 core/src/main/cfml/context/admin/web.cfm    |  7 ++++++-
 loader/build.xml                            |  2 +-
 loader/pom.xml                              |  2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/core/src/main/cfml/context/admin/index.cfm b/core/src/main/cfml/context/admin/index.cfm
index 6696e744e4..09ea0a034c 100644
--- a/core/src/main/cfml/context/admin/index.cfm
+++ b/core/src/main/cfml/context/admin/index.cfm
@@ -3,6 +3,6 @@
 		include "web.cfm";
 	}
 	else {
-		location url="web.cfm?reinit=true" addtoken="no";
+		location url="server.cfm?reinit=true" addtoken="no";
 	}
 </cfscript>
\ No newline at end of file
diff --git a/core/src/main/cfml/context/admin/logout.cfm b/core/src/main/cfml/context/admin/logout.cfm
index 1de1168b7d..218094241c 100755
--- a/core/src/main/cfml/context/admin/logout.cfm
+++ b/core/src/main/cfml/context/admin/logout.cfm
@@ -1,5 +1,16 @@
-<cfset StructDelete(application, "stText")>
-<cfset StructDelete(application, "UpdateProvider")>
-<cfset StructDelete(session,"password"&request.adminType)>
-<cfcookie expires="Now" name="lucee_admin_pw_#request.adminType#" value="">
-<cflocation url="#cgi.SCRIPT_NAME#" addtoken="No">
\ No newline at end of file
+<cfscript>
+    StructDelete(application, "stText");
+    StructDelete(application, "UpdateProvider");
+    if(structKeyExists(url, "full")) {
+        systemOutput("=>"&request.adminType,1,1);
+        StructDelete(session,"passwordweb");
+        StructDelete(session,"passwordserver");
+        cookie expires="Now" name="lucee_admin_pw_web" value="";
+        cookie expires="Now" name="lucee_admin_pw_server" value="";
+    }
+    else {
+        StructDelete(session,"password"&request.adminType);
+        cookie expires="Now" name="lucee_admin_pw_#request.adminType#" value="";
+    }
+    location url="#cgi.SCRIPT_NAME#" addtoken="No";
+</cfscript>
\ No newline at end of file
diff --git a/core/src/main/cfml/context/admin/web.cfm b/core/src/main/cfml/context/admin/web.cfm
index c27552bf18..50ffbbf6c1 100755
--- a/core/src/main/cfml/context/admin/web.cfm
+++ b/core/src/main/cfml/context/admin/web.cfm
@@ -1,4 +1,5 @@
 <cfscript>
+
 	request.singleMode=getApplicationSettings().singleContext;
 	
 	if(request.singleMode && right(cgi.script_name,9)!="index.cfm") {
@@ -47,7 +48,11 @@
 <cfparam name="form.rememberMe" default="s">
 <cfset ad = request.adminType>
 <cfset request.self = (request.singleMode?"index": request.adminType )& ".cfm">
-
+<cfscript>
+	if(structKeyExists(url, "reinit") && (url.action?:"") != "logout") {
+		location url="#cgi.SCRIPT_NAME#?action=logout&full=true" addtoken="No";
+	}
+</cfscript>
 <cfparam name="cookie.lucee_admin_lang" default="en">
 <cfset session.lucee_admin_lang = cookie.lucee_admin_lang>
 
diff --git a/loader/build.xml b/loader/build.xml
index b68c693d8f..43fe9af6a2 100644
--- a/loader/build.xml
+++ b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.0.0.561-SNAPSHOT"/>
+  <property name="version" value="6.0.0.562-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>
diff --git a/loader/pom.xml b/loader/pom.xml
index 79999bdea4..6b4d7efca2 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.0.0.561-SNAPSHOT</version>
+  <version>6.0.0.562-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>