 
 		 <cfcatch>
 		 	<cfset login_error=cfcatch.message>
-			<cfset StructDelete(session,"password"&request.adminType)>
+			<cfset structDelete(session, "password" & request.adminType)>
 		</cfcatch>
 	</cftry>
-
-</cfif>
-
-<cfif not StructKeyExists(session,'lucee_admin_lang')>
+</cfif>
+
+<cfif not structKeyExists(session,'lucee_admin_lang')>
 	<cfset session.lucee_admin_lang ='en'>
 </cfif>
 </cfsilent>
+
 <cfinclude template="resources/text.cfm">
-
 
 <cfset request.self = request.adminType & ".cfm">
 <!--- includes several functions --->
 <cfinclude template="web_functions.cfm">
-<cfif not structKeyExists(application, "adminfunctions") or (structKeyExists(session,"alwaysNew") and session.alwaysNew)>
+<cfif not structKeyExists(application, "adminfunctions") or (structKeyExists(session, "alwaysNew") and session.alwaysNew)>
 	<cfset application.adminfunctions = new adminfunctions() />
 </cfif>
 



<cfset plugins=array()>
<cfif StructKeyExists(session,"password"&request.adminType)>
	<cftry>
	<cfadmin
		action="getPluginDirectory"
		type="#request.adminType#"
		password="#session["password"&request.adminType]#"
		returnVariable="pluginDir">
	<cfset mappings['/lucee_plugin_directory/']=pluginDir>
	<cfapplication action="update" mappings="#mappings#">

	<cfset hasPlugin=false>
	<cfloop array="#navigation#" index="el">
		<cfif el.action EQ "plugin"><cfset hasPlugin=true></cfif>
	</cfloop>

	<cfif not hasPlugin or (structKeyExists(session,"alwaysNew") and session.alwaysNew)>
		<cfif not hasPlugin>
		<cfset plugin=struct(
			label:"Plugins",


<!--- cookie ---->
<cfset fromCookie=false>
<cfif not structKeyExists(session, "password" & request.adminType) and structKeyExists(cookie,'lucee_admin_pw_#server.lucee.version#_#ad#')>
	<cfset fromCookie=true>
	<cftry>
		<cfset session["password"&ad]=cookie['lucee_admin_pw_#server.lucee.version#_#ad#']>
