Add JSON output format.

circuits/scanner/circuit.xml

@@ -98,6 +98,14 @@
 				<do action="layout.blank"/>
 			</cf:case>
 
+			<cf:case value="JSON">
+				<include template="dsp_json" contentvariable="Content">
+					<parameter name="Data" value="#Results.Data#"/>
+					<parameter name="Info" value="#Results.Info#"/>
+				</include>
+				<do action="layout.blank"/>
+			</cf:case>
+
 			<cf:defaultcase>
 				<cf:dump var="#Results#"/>
 				<cf:abort/>

circuits/scanner/dsp_json.cfm

@@ -0,0 +1,34 @@
+<cfcontent type="text/json"/><cfoutput>{
+
+	"info" :
+	{ "count" :
+		{ "alerts"  : #Info.Totals.AlertCount#
+		, "queries" : #Info.Totals.QueryCount#
+		, "files"   : #Info.Totals.FileCount#
+		}
+	, "timetaken" : #Info.Totals.Time#
+	, "timeout"   : #Info.Timeout#
+	}
+
+	, "files" : </cfoutput>
+	[<cfoutput query="Data" group="FileId">
+	<cfif CurrentRow GT 1>,</cfif>
+		{ "id"         : #serializeJson(FileId)#
+		, "name"       : #serializeJson(FileName)#
+		, "alertcount" : #QueryAlertCount#
+		, "queries" :
+			<cfset SubRow = 0 />
+			[<cfoutput><cfif SubRow++ >,</cfif>
+				{ "id" : #serializeJson(QueryId)#
+				, "name" : #serializeJson(QueryName)#
+				<cfif isNumeric(QueryStartLine)>, "startline" : #QueryStartLine#
+				, "endline" : #QueryEndLine#</cfif>
+				<cfif Len(ScopeList)> , "scopes" : #serializeJson(ScopeList)#</cfif>
+				, "code" : #serializeJson(QueryCode)#
+				}
+			</cfoutput>]
+		}
+	</cfoutput>
+	<cfoutput>]
+
+}</cfoutput>

config.ini

@@ -13,7 +13,7 @@ type=text
 [OutputFormat]
 label=Output Format
 type=select
-options=HTML,WDDX,XML
+options=HTML,WDDX,XML,JSON
 
 [RequestTimeout]
 label=Request Timeout