From e32b57c76754caf58053e0b69ccf47a8da2977cf Mon Sep 17 00:00:00 2001
From: MrFelna <MrFelna@users.noreply.github.com>
Date: Thu, 2 May 2024 15:47:24 +0100
Subject: [PATCH 1/2] workaround for dynamic struct keys

---
 packages/forms/forms.cfc                        | 17 +++++++++++++----
 packages/fourq/TableMetadata.cfc                |  7 ++++++-
 packages/fourq/fourq.cfc                        | 17 +++++++++++++----
 packages/lib/fapi.cfc                           | 12 ++++++++----
 .../customadmin/utilities/listfilelocations.cfm | 10 ++++++++--
 5 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/packages/forms/forms.cfc b/packages/forms/forms.cfc
index 277f6726e..3d40c8e40 100644
--- a/packages/forms/forms.cfc
+++ b/packages/forms/forms.cfc
@@ -191,10 +191,19 @@
 			
 			<!--- Get default values --->
 			<cfloop collection="#application.stCOAPI[variables.typename].stProps#" item="prop">
-				
-				<cfparam name="application.stCOAPI[variables.typename].stProps[prop].metadata.Default" default="">
-				<cfparam name="application.stCOAPI[variables.typename].stProps[prop].metadata.ftDefaultType" default="value">
-				<cfparam name="application.stCOAPI[variables.typename].stProps[prop].metadata.ftDefault" default="#application.stCOAPI[variables.typename].stProps[prop].metadata.Default#">
+
+				<cfif not structKeyExists(application.stCOAPI[variables.typename].stProps[prop], "metadata") >
+					<cfset application.stCOAPI[variables.typename].stProps[prop].metadata = structNew() >
+				</cfif>
+				<cfif not structKeyExists(application.stCOAPI[variables.typename].stProps[prop].metadata, "Default") >
+					<cfset application.stCOAPI[variables.typename].stProps[prop].metadata.Default = "" >
+				</cfif>
+				<cfif not structKeyExists(application.stCOAPI[variables.typename].stProps[prop].metadata, "ftDefaultType") >
+					<cfset application.stCOAPI[variables.typename].stProps[prop].metadata.ftDefaultType = "value" >
+				</cfif>
+				<cfif not structKeyExists(application.stCOAPI[variables.typename].stProps[prop].metadata, "ftDefault") >
+					<cfset application.stCOAPI[variables.typename].stProps[prop].metadata.ftDefault = application.stCOAPI[variables.typename].stProps[prop].metadata.Default >
+				</cfif>
 				
 				<cfif application.stCOAPI[variables.typename].stProps[prop].metadata.type eq "array"> 
 					<!--- set to the default if it is not already defined above --->
diff --git a/packages/fourq/TableMetadata.cfc b/packages/fourq/TableMetadata.cfc
index f024d1c7b..dc2ac9281 100644
--- a/packages/fourq/TableMetadata.cfc
+++ b/packages/fourq/TableMetadata.cfc
@@ -79,10 +79,15 @@
 		
 			
 		<cfif structKeyExists(arguments.md,'properties')>
+
+			<cfparam name="variables.tableDefinition" default="#structNew()#" >
 		
 			<!--- If we got to here there should be some properties to parse --->
 			<cfloop from="1" to="#arrayLen(arguments.md.properties)#" index="i">
-				<cfparam name="variables.tableDefinition[arguments.md.properties[i].name]" default="#structNew()#" />
+
+				<cfif not structKeyExists(variables.tableDefinition,arguments.md.properties[i].name)>
+					<cfset variables.tableDefinition[arguments.md.properties[i].name] = structNew() />
+				</cfif>
 
 				<cfset bSuccess = StructAppend(variables.tableDefinition[arguments.md.properties[i].name],parseProperty(arguments.md.properties[i]),false)>
 
diff --git a/packages/fourq/fourq.cfc b/packages/fourq/fourq.cfc
index 0887f20ba..2e8a1def3 100644
--- a/packages/fourq/fourq.cfc
+++ b/packages/fourq/fourq.cfc
@@ -661,10 +661,19 @@ So in the case of a database called 'fourq' - the correct application.dbowner va
 			<!--- check if date type, and set default to the default assigned OR to now() --->
 			
 			<cfif NOT StructKeyExists(stProps, propertie)>
-						
-				<cfparam name="stDefaultProperties[propertie].metadata.Default" default="">
-				<cfparam name="stDefaultProperties[propertie].metadata.ftDefaultType" default="value">
-				<cfparam name="stDefaultProperties[propertie].metadata.ftDefault" default="#stDefaultProperties[propertie].metadata.Default#">
+
+				<cfif not structKeyExists(stDefaultProperties[propertie], "metadata") >
+					<cfset stDefaultProperties[propertie].metadata = structNew() >
+				</cfif>
+				<cfif not structKeyExists(stDefaultProperties[propertie].metadata, "Default") >
+					<cfset stDefaultProperties[propertie].metadata.Default = "" >
+				</cfif>
+				<cfif not structKeyExists(stDefaultProperties[propertie].metadata, "ftDefaultType") >
+					<cfset stDefaultProperties[propertie].metadata.ftDefaultType = "value" >
+				</cfif>
+				<cfif not structKeyExists(stDefaultProperties[propertie].metadata, "ftDefault") >
+					<cfset stDefaultProperties[propertie].metadata.ftDefault = stDefaultProperties[propertie].metadata.Default >
+				</cfif>
 				
 						
 				
diff --git a/packages/lib/fapi.cfc b/packages/lib/fapi.cfc
index e108609c3..fd790f371 100755
--- a/packages/lib/fapi.cfc
+++ b/packages/lib/fapi.cfc
@@ -374,10 +374,14 @@
 		<cfset var stResult = "" />
 		<cfset var o = application.fapi.getContentType("#arguments.typename#") />
 
-		<cfparam name="session.stTempObjectStoreKeys" default="#structNew()#" />
-		<cfparam name="session.stTempObjectStoreKeys[arguments.typename]" default="#structNew()#" />
-		
-		
+		<cfif not structKeyExists(session, "stTempObjectStoreKeys") >
+			<cfset session.stTempObjectStoreKeys = structNew() >
+		</cfif>
+		<cfif not structKeyExists(session.stTempObjectStoreKeys, arguments.typename) >
+			<cfset session.stTempObjectStoreKeys[arguments.typename] = structNew() >
+		</cfif>
+
+
 		<cfloop collection="#arguments#" item="i">
 			<cfif NOT listFindNoCase(lReserved, i)>
 				<cfset arguments.stProperties[i] = arguments[i] />
diff --git a/webtop/customadmin/utilities/listfilelocations.cfm b/webtop/customadmin/utilities/listfilelocations.cfm
index 52c9926a2..0d55fd7e1 100644
--- a/webtop/customadmin/utilities/listfilelocations.cfm
+++ b/webtop/customadmin/utilities/listfilelocations.cfm
@@ -15,8 +15,14 @@
 	<cfif listcontains("type,rule",application.stCOAPI[thistype].class)>
 		<cfloop collection="#application.stCOAPI[thistype].stProps#" item="thisprop">
 			<cfif isdefined("application.stCOAPI.#thistype#.stProps.#thisprop#.metadata.ftType") and listcontains("image,file",application.stCOAPI[thistype].stProps[thisprop].metadata.ftType)>
-				<cfparam name="stFileProps[thistype]" default="#structnew()#" />
-				<cfparam name="stFileProps[thistype][thisprop]" default="#application.stCOAPI[thistype].stProps[thisprop].metadata#" />
+
+				<cfif not structKeyExists(stFileProps, thistype) >
+					<cfset stFileProps[thistype] = structNew() >
+				</cfif>
+				<cfif not structKeyExists(stFileProps[thistype], thisprop) >
+					<cfset stFileProps[thistype][thisprop] = application.stCOAPI[thistype].stProps[thisprop].metadata >
+				</cfif>
+
 			</cfif>
 		</cfloop>
 	</cfif>

From 190a7837b76d17eab255d722d6a9fe8266caeff6 Mon Sep 17 00:00:00 2001
From: MrFelna <MrFelna@users.noreply.github.com>
Date: Wed, 15 May 2024 15:59:49 +0100
Subject: [PATCH 2/2] workaround for dynamic struct keys

---
 tags/webskin/view.cfm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tags/webskin/view.cfm b/tags/webskin/view.cfm
index 322859fdd..aa72f75e0 100644
--- a/tags/webskin/view.cfm
+++ b/tags/webskin/view.cfm
@@ -84,7 +84,9 @@
 			<cfset st = o.getData(objectID = attributes.objectid) />	
 		<cfelseif len(attributes.key)>
 			<cfparam name="session.stTempObjectStoreKeys" default="#structNew()#" />
-			<cfparam name="session.stTempObjectStoreKeys[attributes.typename]" default="#structNew()#" />
+			<cfif not structKeyExists(session.stTempObjectStoreKeys, attributes.typename) >
+				<cfset session.stTempObjectStoreKeys[attributes.typename] = structNew() >
+			</cfif>
 			
 			<cfif structKeyExists(session.stTempObjectStoreKeys[attributes.typename], attributes.key)>
 				<cfif structKeyExists(Session.TempObjectStore, session.stTempObjectStoreKeys[attributes.typename][attributes.key])>