- Implemented CSP (Content Security Policy)

lib/histogram-sql.adp

 <div id=@diagram_id@></div>
-<script type='text/javascript'>
+<script type='text/javascript' <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
 
 Ext.require([
 	'Ext.chart.*', 

lib/project-eva.adp

 <div id=@diagram_id@></div>
-<script type='text/javascript'>
+<script type='text/javascript' <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
 
 Ext.require(['Ext.chart.*', 'Ext.Window', 'Ext.fx.target.Sprite', 'Ext.layout.container.Fit']);
 Ext.onReady(function () {

lib/revenue-by-dept.adp

 <div id="@diagram_id@" style="height: @diagram_height@px; width: @diagram_width@px"></div>
-<script type='text/javascript'>
+<script type='text/javascript' <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
 Ext.require(['Ext.chart.*', 'Ext.Window', 'Ext.fx.target.Sprite', 'Ext.layout.container.Fit']);
 Ext.onReady(function () {
 

lib/revenue-by-year-monthly.adp

 <div id="@diagram_id@" style="height: @diagram_height@px; width: @diagram_width@px"></div>
-<script type='text/javascript'>
+<script type='text/javascript' <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
 Ext.require(['Ext.chart.*', 'Ext.Window', 'Ext.fx.target.Sprite', 'Ext.layout.container.Fit']);
 Ext.onReady(function () {
 

lib/scatter-diagram.adp

 <if @project_count@ ge 2>
 
 <div id=@diagram_id@></div>
-<script type='text/javascript'>
+<script type='text/javascript' <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
 Ext.require(['Ext.chart.*', 'Ext.Window', 'Ext.fx.target.Sprite', 'Ext.layout.container.Fit']);
 
     window.store1 = Ext.create('Ext.data.JsonStore', {
@@ -45,7 +45,7 @@ Ext.onReady(function () {
 	    yField: 'y_axis',
 	    highlight: true,
 	    markerConfig: { type: 'circle' },
-	    renderer: createHandler('xxx'),
+	    renderer: createHandler(),
 	    label: {
                 display: 'under',
                 field: 'caption',

lib/top-customers.adp

 <div id="@diagram_id@" style="height: @diagram_height@px; width: @diagram_width@px"></div>
-<script type='text/javascript'>
+<script type='text/javascript' <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
 Ext.require(['Ext.chart.*', 'Ext.Window', 'Ext.fx.target.Sprite', 'Ext.layout.container.Fit']);
 Ext.onReady(function () {
     

tcl/intranet-reporting-dashboard-procs.tcl

@@ -653,7 +653,7 @@ ad_proc im_dashboard_pie_chart {
 
     return "
         <div style='$border position:relative;top:0px;height:${diagram_y_size}px;width:${diagram_x_size}px;'>
-        <SCRIPT Language=JavaScript>
+        <SCRIPT type=\"text/javascript\" nonce=\"[im_csp_nonce]\">
         P=new Array();
         document.open();
         _BFont=\"color:\#$font_color;font-size:${font_size}pt;$font_style\";
@@ -775,7 +775,7 @@ ad_proc im_dashboard_histogram {
 
     set histogram_html "
         <div style='$border position:relative;top:0px;height:[expr {$diagram_y_size+20}]px;width:${diagram_x_size}px;'>
-	<SCRIPT Language=JavaScript type='text/javascript'>
+        <SCRIPT type=\"text/javascript\" nonce=\"[im_csp_nonce]\">
 	document.open();
 	var $diag=new Diagram();
 	_BFont=\"font-family:Verdana;font-weight:normal;font-size:8pt;line-height:10pt;\";

www/area-diagram-test.adp

@@ -2,7 +2,7 @@
 <link rel='stylesheet' href='/sencha-extjs-v421/resources/css/ext-all.css'  type='text/css' media='screen'>
 <script type='text/javascript' src='/sencha-extjs-v421-dev/ext-all-debug-w-comments.js'></script>
 <div id=diagram_12345></div>
-<script type='text/javascript'>
+<script type='text/javascript' <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
 
 Ext.require(['Ext.chart.*', 'Ext.Window', 'Ext.fx.target.Sprite', 'Ext.layout.container.Fit']);
 Ext.onReady(function () {

www/yearly_revenues.adp

 <master>
-<property name="header_stuff"><SCRIPT Language="JavaScript" src="/resources/diagram/diagram/diagram.js"></SCRIPT></property>
+<property name="header_stuff">
+<!-- <SCRIPT Language="JavaScript" src="/resources/diagram/diagram/diagram.js"></SCRIPT></property> -->
 
 
 <h2>First Header</h2>