Merge pull request #76 from farcrycore/p720-FC-3138

FC-3138 validate url.type against stCOAPI

Author: justincarter

tags/navajo/display.cfm

@@ -68,6 +68,10 @@
 <cfparam name="url.type" default="" />
 <cfparam name="url.view" default="" />
 
+<!--- ensure application.stCOAPI record exists for url.type --->
+<cfif NOT structKeyExists(application.stCOAPI, url.type)>
+	<cfset url.type = "">
+</cfif>
 
 <!--- get standard webskin names by device type --->
 <cfset stWebskins = application.fc.lib.device.getDeviceWebskinNames()>
@@ -227,10 +231,10 @@
 	</cfif>
 
 	<!--- either stream the webskin result with an appropriate mime type, or output it normally --->
-	<cfif len(url.type) AND len(url.view) AND application.stCOAPI[url.type].stWebskins[url.view].viewstack eq "ajax">
+	<cfif len(url.type) AND len(url.view) AND structKeyExists(application.stCOAPI, url.type) AND structKeyExists(application.stCOAPI[url.type].stWebskins, url.view) AND application.stCOAPI[url.type].stWebskins[url.view].viewstack eq "ajax">
 		<cfset request.mode.ajax = true />
 	</cfif>
-	<cfif len(url.type) AND len(url.view) AND application.stCOAPI[url.type].stWebskins[url.view].viewstack eq "data" AND structkeyexists(application.stCOAPI[url.type].stWebskins[url.view],"mimeType")>
+	<cfif len(url.type) AND len(url.view) AND structKeyExists(application.stCOAPI, url.type) AND structKeyExists(application.stCOAPI[url.type].stWebskins, url.view) AND application.stCOAPI[url.type].stWebskins[url.view].viewstack eq "data" AND structkeyexists(application.stCOAPI[url.type].stWebskins[url.view],"mimeType")>
 		<cfset request.mode.ajax = true />
 
 		<cfinvoke component="#application.fapi#" method="stream">
@@ -340,4 +344,4 @@
 
 <core:displayTray />
 
-<cfsetting enablecfoutputonly="false" />
+<cfsetting enablecfoutputonly="false" />