From 1da80725ba3bbc45abd9e90743f011fcd4dfabae Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:03:12 +0200
Subject: [PATCH] LDEV-5030 - replace dynamic isDefined

---
 .../main/cfml/context/admin/admin.search.cfm  | 10 ++++--
 .../admin/debugging.templates.list.cfm        |  2 +-
 .../context/admin/ext.applications.upload.cfm |  6 +---
 .../main/cfml/context/admin/ext.functions.cfm |  2 +-
 .../src/main/cfml/context/admin/messaging.cfm |  5 ++-
 .../context/admin/remote.clients.list.cfm     |  4 +--
 .../cfml/context/admin/resources.cfx_tags.cfm |  6 ++--
 .../context/admin/resources.component.cfm     | 18 +++++------
 .../context/admin/resources.customtags.cfm    | 32 ++++++++-----------
 .../admin/resources.customtags.old.cfm        |  8 ++---
 .../cfml/context/admin/resources.mappings.cfm | 19 ++++++-----
 .../cfml/context/admin/resources.rest.cfm     |  4 +--
 .../context/admin/server.logging.list.cfm     |  2 +-
 .../context/admin/services.cache.list.cfm     |  4 +--
 .../admin/services.datasource.list.cfm        |  4 +--
 .../context/admin/services.gateway.list.cfm   |  6 ++--
 .../main/cfml/context/admin/services.mail.cfm | 20 ++++++------
 .../context/admin/services.schedule.list.cfm  |  8 ++---
 .../cfml/context/admin/services.tasks.cfm     |  4 +--
 .../main/cfml/context/admin/tabbedPane.cfm    |  4 +--
 loader/build.xml                              |  2 +-
 loader/pom.xml                                |  2 +-
 22 files changed, 84 insertions(+), 88 deletions(-)

diff --git a/core/src/main/cfml/context/admin/admin.search.cfm b/core/src/main/cfml/context/admin/admin.search.cfm
index 86c60ad215..5abb1fa92f 100644
--- a/core/src/main/cfml/context/admin/admin.search.cfm
+++ b/core/src/main/cfml/context/admin/admin.search.cfm
@@ -81,8 +81,14 @@
 	<cfoutput query="q">
 		<cfset action = rereplace(q.page, '\.cfm$', '') />
 		<!--- try to create friendly name for current page --->
-		<cfif isDefined("variables.data.menu.#listfirst(action, '.')#.label") and isDefined("variables.data.menu.#action#")>
-			<cfset pagename = variables.data.menu[listfirst(action, '.')].label & " - " & evaluate("variables.data.menu.#action#") />
+		<cfif 
+			isDefined("variables.data.menu") and
+			structKeyExists(variables.data.menu, listfirst(action, '.')) and
+			structKeyExists(variables.data.menu[listfirst(action, '.')], "label") and 
+			
+			isDefined("variables.data.menu") and
+			structKeyExists(variables.data.menu, action)>
+			<cfset pagename = variables.data.menu[listfirst(action, '.')].label & " - " & variables.data.menu[action] />
 		<cfelse>
 			<cfset pagename = rereplace(replace(action, ".", " - "), '.', '\U\0') />
 		</cfif>
diff --git a/core/src/main/cfml/context/admin/debugging.templates.list.cfm b/core/src/main/cfml/context/admin/debugging.templates.list.cfm
index 6d654e61c8..be5d6e35f1 100755
--- a/core/src/main/cfml/context/admin/debugging.templates.list.cfm
+++ b/core/src/main/cfml/context/admin/debugging.templates.list.cfm
@@ -29,7 +29,7 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				<cfset data.ids=toArrayFromForm("id")>
 				<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
-					<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
 						<cfadmin 
 							action="removeDebugEntry"
 							type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/ext.applications.upload.cfm b/core/src/main/cfml/context/admin/ext.applications.upload.cfm
index a3537596ad..853257772a 100755
--- a/core/src/main/cfml/context/admin/ext.applications.upload.cfm
+++ b/core/src/main/cfml/context/admin/ext.applications.upload.cfm
@@ -122,11 +122,7 @@
 	<cfif not structKeyExists(qData, key)>
 		<cfcontinue />
 	</cfif>
-	<cfif isDefined("configXml.config.info[key].xmlText")>
-		<cfset qData[key] = configXml.config.info[key].xmlText />
-	<cfelse>
-		<cfset qData[key] = "" />
-	</cfif>
+	<cfset qData[key] = configXml.config.info[key].xmlText?:"" />
 </cfloop>
 
 
diff --git a/core/src/main/cfml/context/admin/ext.functions.cfm b/core/src/main/cfml/context/admin/ext.functions.cfm
index 9e976c1b22..7f77831340 100644
--- a/core/src/main/cfml/context/admin/ext.functions.cfm
+++ b/core/src/main/cfml/context/admin/ext.functions.cfm
@@ -545,7 +545,7 @@
 			}
 
 			// sucessfull
-			if(http.status_code==200) { // if(isDefined("http.responseheader['Return-Format']"))
+			if(http.status_code==200) {
 				local.result=deserializeJson(http.fileContent,false);
 				
 				result.lastModified=now();
diff --git a/core/src/main/cfml/context/admin/messaging.cfm b/core/src/main/cfml/context/admin/messaging.cfm
index d686210e49..c9b76c36a8 100755
--- a/core/src/main/cfml/context/admin/messaging.cfm
+++ b/core/src/main/cfml/context/admin/messaging.cfm
@@ -29,9 +29,8 @@ ACTIONS --->
 			<cfset data.ports=toArrayFromForm("port")>
 			<cfset data.rows=toArrayFromForm("row")>
 			<cfloop index="idx" from="1" to="#arrayLen(data.hosts)#">
-				<cfif isDefined("data.rows[#idx#]") and data.hosts[idx] NEQ "">
-					<cfparam name="data.ports[#idx#]" default="21">
-					<cfif trim(data.ports[idx]) EQ ""><cfset data.ports[idx]=21></cfif>
+				<cfif arrayIndexExists(data.rows, idx) and data.hosts[idx] NEQ "">
+					<cfif trim(data.ports[idx]?:"") EQ ""><cfset data.ports[idx]=21></cfif>
 					<cfset admin.updateMailServer(data.rows[idx]-1,data.hosts[idx],data.usernames[idx],data.passwords[idx],toInt(data.ports[idx]))>
 				</cfif>
 			</cfloop>
diff --git a/core/src/main/cfml/context/admin/remote.clients.list.cfm b/core/src/main/cfml/context/admin/remote.clients.list.cfm
index 95f504f0b8..368f15563f 100755
--- a/core/src/main/cfml/context/admin/remote.clients.list.cfm
+++ b/core/src/main/cfml/context/admin/remote.clients.list.cfm
@@ -28,7 +28,7 @@
 			<cfset data.rows=toArrayFromForm("row")>
 			
 			<cfloop index="idx" from="1" to="#arrayLen(data.urls)#">
-				<cfif isDefined("data.rows[#idx#]") and data.urls[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.urls[idx] NEQ "">
 					<cfadmin 
 						action="removeRemoteClient"
 						type="#request.adminType#"
@@ -44,7 +44,7 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.urls)#">
-					<cfif isDefined("data.rows[#idx#]") and data.urls[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.urls[idx] NEQ "">
 						<cfadmin 
 							action="getRemoteClient"
 							type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/resources.cfx_tags.cfm b/core/src/main/cfml/context/admin/resources.cfx_tags.cfm
index b3d1628d36..b0e3525aa6 100755
--- a/core/src/main/cfml/context/admin/resources.cfx_tags.cfm
+++ b/core/src/main/cfml/context/admin/resources.cfx_tags.cfm
@@ -47,7 +47,7 @@ Defaults --->
 		<!--- update --->
 			<cfif form.subAction EQ "#stText.Buttons.save#">
 				<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-					<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 						<cfset data.names[idx] = REReplaceNoCase(data.names[idx],"(<cfx_)|(<)|(>)","","ALL")>
 						<cfadmin 
 							action="updateJavaCFX"
@@ -63,7 +63,7 @@ Defaults --->
 			<cfelseif form.subAction EQ "#stText.Buttons.verify#">
 				<cfset noRedirect=true>
 				<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-					<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 						<cftry>
 							<cfadmin 
 								action="verifyCFX"
@@ -85,7 +85,7 @@ Defaults --->
 			<cfelseif form.subAction EQ "#stText.Buttons.Delete#">
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-					<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 					<cfadmin 
 						action="removeCFX"
 						type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/resources.component.cfm b/core/src/main/cfml/context/admin/resources.component.cfm
index 5d95823b0c..ac2fedb6af 100644
--- a/core/src/main/cfml/context/admin/resources.component.cfm
+++ b/core/src/main/cfml/context/admin/resources.component.cfm
@@ -66,9 +66,9 @@ Defaults --->
 				<cfset data.rows=toArrayFromForm("row")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.addNonCFMLFiles[idx]=isDefined("data.addNonCFMLFiles[#idx#]") and data.addNonCFMLFiles[idx]>
-						<cfset data.addCFMLFiles[idx]=isDefined("data.addCFMLFiles[#idx#]") and data.addCFMLFiles[idx]>
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.addNonCFMLFiles[idx]=data.addNonCFMLFiles[idx]?:false>
+						<cfset data.addCFMLFiles[idx]=data.addCFMLFiles[idx]?:false>
 					
 					<cfset ext='lar'>
 					<cfset target=getTempDirectory() & Rand() & "."&ext>
@@ -120,9 +120,9 @@ Defaults --->
 				<cfset data.rows=toArrayFromForm("row")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.toplevels[idx]=isDefined("data.toplevels[#idx#]") and data.toplevels[idx]>
-						<cfset data.stoponerrors[idx]=isDefined("data.stoponerrors[#idx#]") and data.stoponerrors[idx]>
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.toplevels[idx]=data.toplevels[idx]?:false>
+						<cfset data.stoponerrors[idx]=data.stoponerrors[idx]?:false>
 					
 					<cfadmin 
 						action="compileComponentMapping"
@@ -149,7 +149,7 @@ Defaults --->
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
 					
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
 						<cfadmin 
 							action="removeComponentMapping"
 							type="#request.adminType#"
@@ -174,8 +174,8 @@ Defaults --->
 				<cfset data.rows=toArrayFromForm("row")>
 				
                 <cfloop index="idx" from="1" to="#arrayLen(data.physicals)#">
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.inspects[idx]=data.inspects[idx]?:"">
 					<cfset name=data.names[idx]?:"">
 					<cfset virtual=trim(data.virtuals[idx])>
 					<cfif len(name)>
diff --git a/core/src/main/cfml/context/admin/resources.customtags.cfm b/core/src/main/cfml/context/admin/resources.customtags.cfm
index 81ba0d5efc..066c246b0d 100644
--- a/core/src/main/cfml/context/admin/resources.customtags.cfm
+++ b/core/src/main/cfml/context/admin/resources.customtags.cfm
@@ -6,17 +6,13 @@
 <cfset stText.CustomTags.PrimaryDesc="Defines where Lucee looks first for a requested custom tags">
 <cfset stText.CustomTags.trustedDesc="When does Lucee checks for changes in the source file for an already loaded custom tags">
 
-
-<!--- <cfif isDefined("form")>
-	<cfinclude template="act/resources.act_mapping.cfm">
-</cfif> --->
 <cfset error.message="">
 <cfset error.detail="">
 <cfparam name="url.action2" default="list">
 <cfscript>
-	function arrayRemoveValue(arr,value){
+	function arrayRemoveValue(arr,value) {
 		var index=arrayFindNoCase(arr,value);
-		if(index GT 0)ArrayDeleteAt(arr,index);
+		if(index GT 0) ArrayDeleteAt(arr,index);
 	}
 </cfscript>
 
@@ -58,9 +54,9 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.addNonCFMLFiles[idx]=isDefined("data.addNonCFMLFiles[#idx#]") and data.addNonCFMLFiles[idx]>
-						<cfset data.addCFMLFiles[idx]=isDefined("data.addCFMLFiles[#idx#]") and data.addCFMLFiles[idx]>
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.addNonCFMLFiles[idx]=data.addNonCFMLFiles[idx]?:false>
+						<cfset data.addCFMLFiles[idx]=data.addCFMLFiles[idx]?:false>
 					
 					<cfset ext='lar'>
 					<cfset target=getTempDirectory() & Rand() & "."&ext>
@@ -122,9 +118,9 @@
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
 				
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.toplevels[idx]=isDefined("data.toplevels[#idx#]") and data.toplevels[idx]>
-						<cfset data.stoponerrors[idx]=isDefined("data.stoponerrors[#idx#]") and data.stoponerrors[idx]>
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.toplevels[idx]=data.toplevels[idx]?:false>
+						<cfset data.stoponerrors[idx]=data.stoponerrors[idx]?:false>
 					
 					<cfadmin 
 						action="compileCTMapping"
@@ -152,9 +148,9 @@
 						type="#request.adminType#"
 						password="#session["password"&request.adminType]#"
 						
-						deepSearch="#isDefined('form.customTagDeepSearchDesc') and form.customTagDeepSearchDesc EQ true#"
-						localSearch="#isDefined('form.customTagLocalSearchDesc') and form.customTagLocalSearchDesc EQ true#"
-						customTagPathCache="#isDefined('form.customTagPathCache') and form.customTagPathCache EQ true#"
+						deepSearch="#form.customTagDeepSearchDesc?:false#"
+						localSearch="#form.customTagLocalSearchDesc?:false#"
+						customTagPathCache="#form.customTagPathCache?:false#"
 						
 						
 						
@@ -172,8 +168,8 @@
 				<cfset data.rows=toArrayFromForm("row")>
 
 				<cfloop index="idx" from="1" to="#arrayLen(data.physicals)#">
-					<cfif isDefined("data.rows[#idx#]")>
-						<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
+					<cfif arrayIndexExists(data.rows, idx)>
+						<cfset data.inspects[idx]=data.inspects[idx]?:"">
 					
 					<cfset name=data.names[idx]?:"">
 					<cfset virtual=trim(data.virtuals[idx]?:"")>
@@ -204,7 +200,7 @@
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
 					
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
 						<cfadmin 
 							action="removeCustomTag"
 							type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/resources.customtags.old.cfm b/core/src/main/cfml/context/admin/resources.customtags.old.cfm
index 1f71df2800..22d42fe9a1 100644
--- a/core/src/main/cfml/context/admin/resources.customtags.old.cfm
+++ b/core/src/main/cfml/context/admin/resources.customtags.old.cfm
@@ -7,7 +7,7 @@
 <cfscript>
 	function arrayRemoveValue(arr,value){
 		var index=arrayFindNoCase(arr,value);
-		if(index GT 0)ArrayDeleteAt(arr,index);
+		if(index GT 0) ArrayDeleteAt(arr,index);
 	}
 </cfscript>
 
@@ -63,8 +63,8 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.physicals)#">
-					<cfif isDefined("data.rows[#idx#]")>
-						<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
+					<cfif arrayIndexExists(data.rows, idx)>
+						<cfset data.inspects[idx]=data.inspects[idx]?:"">
 					
 					<cfset name=data.names[idx]?:"">
 					<cfset virtual=trim(data.virtuals[idx]?:"")>
@@ -93,7 +93,7 @@
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
 					
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
 						<cfadmin 
 							action="removeCustomTag"
 							type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/resources.mappings.cfm b/core/src/main/cfml/context/admin/resources.mappings.cfm
index 550eb6aa23..a1da4f43b2 100644
--- a/core/src/main/cfml/context/admin/resources.mappings.cfm
+++ b/core/src/main/cfml/context/admin/resources.mappings.cfm
@@ -36,9 +36,8 @@ Defaults --->
 				<cfset data.rows=toArrayFromForm("row")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.stoponerrors[idx]=isDefined("data.stoponerrors[#idx#]") and data.stoponerrors[idx]>
-					
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.stoponerrors[idx]=(data.stoponerrors[idx]?:false)>
 					<cfadmin 
 						action="compileMapping"
 						type="#request.adminType#"
@@ -61,9 +60,9 @@ Defaults --->
 				<cfset data.rows=toArrayFromForm("row")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.addCFMLFiles[idx]=isDefined("data.addCFMLFiles[#idx#]") and data.addCFMLFiles[idx]>
-						<cfset data.addNonCFMLFiles[idx]=isDefined("data.addNonCFMLFiles[#idx#]") and data.addNonCFMLFiles[idx]>
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.addCFMLFiles[idx]=(data.addCFMLFiles[idx]?:false)>
+						<cfset data.addNonCFMLFiles[idx]=(data.addNonCFMLFiles[idx]?:false)>
 					
 					<cfset ext="lar">
 					<cfset target=getTempDirectory() & Rand() & "."&ext>
@@ -121,9 +120,9 @@ Defaults --->
 				<cfset data.rows=toArrayFromForm("row")>
 
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
-						<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
-						<cfset data.toplevels[idx]=isDefined("data.toplevels[#idx#]") and data.toplevels[idx]>
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
+						<cfset data.inspects[idx]=data.inspects[idx]?:"">
+						<cfset data.toplevels[idx]=data.toplevels[idx]?:false>
 					<cfadmin 
 						action="updateMapping"
 						type="#request.adminType#"
@@ -150,7 +149,7 @@ Defaults --->
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
 					
-					<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
 						<cfif false && fileExists(mappings.archive[#idx#])>
 							<!--- TODO see LDEV-2379 --->
 							<cfset filedelete(mappings.archive[#idx#])>
diff --git a/core/src/main/cfml/context/admin/resources.rest.cfm b/core/src/main/cfml/context/admin/resources.rest.cfm
index 9970dfbfda..3799a63e18 100644
--- a/core/src/main/cfml/context/admin/resources.rest.cfm
+++ b/core/src/main/cfml/context/admin/resources.rest.cfm
@@ -40,7 +40,7 @@
 
             <cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
             	<cfset _default=StructKeyExists(form,'default') and form.default EQ idx>
-				<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">aaa
+				<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">aaa
                 <cfadmin
                     action="updateRestMapping"
                     type="#request.adminType#"
@@ -63,7 +63,7 @@
 
             <cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
             	<cfset _default=StructKeyExists(form,'default') and form.default EQ idx>
-				<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">aaa
+				<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">aaa
                 <cfadmin
                     action="removeRestMapping"
                     type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/server.logging.list.cfm b/core/src/main/cfml/context/admin/server.logging.list.cfm
index 30704e3fe7..bc417c3060 100755
--- a/core/src/main/cfml/context/admin/server.logging.list.cfm
+++ b/core/src/main/cfml/context/admin/server.logging.list.cfm
@@ -6,7 +6,7 @@
 			<cfset data.names=toArrayFromForm("name")>
 			<cfset data.rows=toArrayFromForm("row")>
 			<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-				<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 					<cfadmin 
 						action="removeLogSetting"
 						type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/services.cache.list.cfm b/core/src/main/cfml/context/admin/services.cache.list.cfm
index 29d3e1e9b8..4da99cb0c4 100755
--- a/core/src/main/cfml/context/admin/services.cache.list.cfm
+++ b/core/src/main/cfml/context/admin/services.cache.list.cfm
@@ -31,7 +31,7 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				<cfset data.names=toArrayFromForm("name")>
 				<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-					<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 						<cfadmin 
 							action="removeCacheConnection"
 							type="#request.adminType#"
@@ -48,7 +48,7 @@
 				<cfset data.names=toArrayFromForm("name")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-					<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 						<cftry>
 							<cfadmin 
 								action="verifyCacheConnection"
diff --git a/core/src/main/cfml/context/admin/services.datasource.list.cfm b/core/src/main/cfml/context/admin/services.datasource.list.cfm
index 1379133d05..af16666c0a 100644
--- a/core/src/main/cfml/context/admin/services.datasource.list.cfm
+++ b/core/src/main/cfml/context/admin/services.datasource.list.cfm
@@ -8,7 +8,7 @@
 				<cfset data.names=toArrayFromForm("name")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-					<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 						<cfadmin 
 							action="removeDatasource"
 							type="#request.adminType#"
@@ -27,7 +27,7 @@
 				<cfset data.usernames=toArrayFromForm("username")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-					<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 						<cftry>
 							<cfadmin 
 								action="verifyDatasource"
diff --git a/core/src/main/cfml/context/admin/services.gateway.list.cfm b/core/src/main/cfml/context/admin/services.gateway.list.cfm
index 44c76f9f5b..6a83575f58 100755
--- a/core/src/main/cfml/context/admin/services.gateway.list.cfm
+++ b/core/src/main/cfml/context/admin/services.gateway.list.cfm
@@ -16,7 +16,7 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				<cfset data.ids=toArrayFromForm("id")>
 				<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
-					<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
 						<cfadmin 
 							action="removeGatewayEntry"
 							type="#request.adminType#"
@@ -31,7 +31,7 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				<cfset data.ids=toArrayFromForm("id")>
 				<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
-					<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
 						<cfadmin 
 							action="gateway"
 							type="#request.adminType#"
@@ -49,7 +49,7 @@
 				<cfset data.rows=toArrayFromForm("row")>
 				<cfset data.ids=toArrayFromForm("id")>
 				<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
-					<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
                     	<cfadmin 
                             action="getGatewayEntry"
                             type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/services.mail.cfm b/core/src/main/cfml/context/admin/services.mail.cfm
index 19e113559e..e9d5b9f2f2 100755
--- a/core/src/main/cfml/context/admin/services.mail.cfm
+++ b/core/src/main/cfml/context/admin/services.mail.cfm
@@ -115,9 +115,9 @@ Defaults --->
 				<cfset data.lifes=toTimeSpan("life")>
 				
 				<cfloop index="idx" from="1" to="#arrayLen(data.hosts)#">
-					<cfif isDefined("data.rows[#idx#]") and data.hosts[idx] NEQ "">
-						<cfparam name="data.ports[idx]" default="25">
-						<cfif trim(data.ports[idx]) EQ "">
+					<cfif (data.hosts[idx]?:"") NEQ "">
+
+						<cfif trim(data.ports[idx]?:"") EQ "">
 							<cfset data.ports[idx]=25>
 						</cfif>
 						<cfset pw=toPassword(data.hosts[idx],session["password"&request.adminType], ms)>
@@ -133,9 +133,9 @@ Defaults --->
 							
 
 							port="#data.ports[idx]#"
-							id="#isDefined("data.ids[#idx#]")?data.ids[idx]:''#"
-							tls="#isDefined("data.tlss[#idx#]") and data.tlss[idx]#"
-							ssl="#isDefined("data.ssls[#idx#]") and data.ssls[idx]#"
+							id="#data.ids[idx]?:''#"
+							tls="#data.tlss[idx]?:false#"
+							ssl="#data.ssls[idx]?:false#"
 							remoteClients="#request.getRemoteClients()#">
 					</cfif>
 				</cfloop>
@@ -148,13 +148,13 @@ Defaults --->
 				<cflock type="exclusive" scope="application" timeout="5"></cflock> --->
 				<cfset len=arrayLen(data.hosts)>
 				<cfloop index="idx" from="1" to="#len#">
-					<cfif isDefined("data.rows[#idx#]") and data.hosts[idx] NEQ "">
+					<cfif (data.hosts[idx]?:"") NEQ "">
 						<cfadmin 
 							action="removeMailServer"
 							type="#request.adminType#"
 							password="#session["password"&request.adminType]#"
 							
-							id="#isDefined("data.ids[#idx#]")?data.ids[idx]:''#"
+							id="#data.ids[idx]?:''#"
 							hostname="#data.hosts[idx]#"
 							username="#data.usernames[idx]#"
 							remoteClients="#request.getRemoteClients()#">
@@ -168,7 +168,7 @@ Defaults --->
 				<cfset data.ports=toArrayFromForm("port")>
 				<cfset doNotRedirect=true>
 				<cfloop index="idx" from="1" to="#arrayLen(data.rows)#">
-					<cfif isDefined("data.rows[#idx#]") and isDefined("data.hosts[#idx#]") and data.hosts[idx] NEQ "">
+					<cfif arrayIndexExists(data.rows, idx) and (data.hosts[idx]?:"") NEQ "">
 						<cftry>
 							<cfadmin 
 								action="verifyMailServer"
@@ -213,7 +213,7 @@ Defaults --->
 	<cfcatch>
 		<cfset error.message=cfcatch.message>
 		<cfset error.detail=cfcatch.Detail>
-		<cfset error.cfcatch=cfcatch>
+		<cfset error.cfcatch=cfcatch><cfrethrow>
 	</cfcatch>
 </cftry>
 
diff --git a/core/src/main/cfml/context/admin/services.schedule.list.cfm b/core/src/main/cfml/context/admin/services.schedule.list.cfm
index 9e2a7b6160..6dc92ade29 100755
--- a/core/src/main/cfml/context/admin/services.schedule.list.cfm
+++ b/core/src/main/cfml/context/admin/services.schedule.list.cfm
@@ -44,7 +44,7 @@ Defaults --->
 			<cfset data.names=toArrayFromForm("name")>
 			<cfset data.rows=toArrayFromForm("row")>
 			<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-				<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 				<cfsetting requesttimeout="10000">
 					<cfadmin 
 						action="schedule" 
@@ -62,7 +62,7 @@ Defaults --->
 			<cfset data.names=toArrayFromForm("name")>
 			<cfset data.rows=toArrayFromForm("row")>
 			<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-				<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 				
 					<cfadmin 
 						action="schedule" 
@@ -80,7 +80,7 @@ Defaults --->
 			<cfset data.names=toArrayFromForm("name")>
 			<cfset data.rows=toArrayFromForm("row")>
 			<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-				<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 				
 					<cfadmin 
 						action="schedule" 
@@ -98,7 +98,7 @@ Defaults --->
 			<cfset data.names=toArrayFromForm("name")>
 			<cfset data.rows=toArrayFromForm("row")>
 			<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
-				<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
 				
 					<cfadmin 
 						action="schedule" 
diff --git a/core/src/main/cfml/context/admin/services.tasks.cfm b/core/src/main/cfml/context/admin/services.tasks.cfm
index 00f495f9cf..6cffec37a0 100755
--- a/core/src/main/cfml/context/admin/services.tasks.cfm
+++ b/core/src/main/cfml/context/admin/services.tasks.cfm
@@ -59,7 +59,7 @@
 			<cfset data.ids=toArrayFromForm("id")>
 			<cfset data.rows=toArrayFromForm("row")>
 			<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
-				<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
 					<cftry>
 						<cfadmin 
 							action="executeSpoolerTask"
@@ -82,7 +82,7 @@
 			<cfset data.rows=toArrayFromForm("row")>
 			
 			<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
-				<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
+				<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
 					<cfadmin 
 						action="removeSpoolerTask"
 						type="#request.adminType#"
diff --git a/core/src/main/cfml/context/admin/tabbedPane.cfm b/core/src/main/cfml/context/admin/tabbedPane.cfm
index 5e4b9c5414..f3840624ee 100644
--- a/core/src/main/cfml/context/admin/tabbedPane.cfm
+++ b/core/src/main/cfml/context/admin/tabbedPane.cfm
@@ -7,7 +7,7 @@
 		<cfset request.tpnames[attributes.name]=1>
 		<cfset actionName=attributes.name&"_tab">
 		<cfparam name="attributes.name" default="">
-		<cfif isDefined('url.'&actionName)>
+		<cfif structKeyExists(url,actionName)>
 			<cfset cTab=url[actionName]>
 		<cfelse>
 			<cfset cTab=attributes.default>
@@ -17,7 +17,7 @@
 		<cfset baseurl=request.self>
 		<cfset baseurl=cgi.query_string>
 
-		<cfif isDefined('url.#actionName#')>
+		<cfif structKeyExists(url,actionName)>
 			<cfset qs="">
 			<cfloop collection="#url#" item="key">
 				<cfif key NEQ actionName><cfset qs=qs&key&"="&url[key]&"&"></cfif>
diff --git a/loader/build.xml b/loader/build.xml
index 6697be7ce1..cad4128ad5 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.1.1.61-SNAPSHOT"/>
+  <property name="version" value="6.1.1.62-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 c304ae07ee..4f6cca0c13 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.1.61-SNAPSHOT</version>
+  <version>6.1.1.62-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>