diff --git a/agc_2-X/trunk/www/vicidial/AST_CLOSER_service_level.php b/agc_2-X/trunk/www/vicidial/AST_CLOSER_service_level.php
index 2ef74618..f8a075f2 100644
--- a/agc_2-X/trunk/www/vicidial/AST_CLOSER_service_level.php
+++ b/agc_2-X/trunk/www/vicidial/AST_CLOSER_service_level.php
@@ -39,6 +39,7 @@
 # 170409-1559 - Added IP List validation code
 # 170602-1008 - Added 8am-5pm shift
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -960,6 +961,7 @@ $CSV_text.="\"TOTALS\",\"$FtotDROPS\",\"$FtotDROPSpct%\",\"$FtotDROPSavg\",\"$Ft
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL STATUS STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH.=$graphCanvas;
 
 
@@ -1299,6 +1301,7 @@ for ($q=0; $q<count($graph_array); $q++) {
 $graph_count=count($graph_array);
 $graph_title=_QXZ("AVERAGE HOLD TIME");
 include("graphcanvas.inc");
+$HEADER.=$HTML_graph_head;
 $GRAPH_text.=$graphCanvas."<PRE>";
 
 
@@ -1487,7 +1490,7 @@ else
 	echo "$HEADER";
 	require("admin_header.php");
 	echo "$MAIN";
-	echo $JS_text;
+	if ($report_display_type=="HTML") {echo $JS_text;}
 	}
 }
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_CLOSERstats.php b/agc_2-X/trunk/www/vicidial/AST_CLOSERstats.php
index 989e7e02..64e54c96 100644
--- a/agc_2-X/trunk/www/vicidial/AST_CLOSERstats.php
+++ b/agc_2-X/trunk/www/vicidial/AST_CLOSERstats.php
@@ -58,6 +58,7 @@
 # 170324-0740 - Fix for daylight savings time issue
 # 170409-1559 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1294,6 +1295,7 @@ if ($report_display_type=="HTML") {
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("QUEUE SECONDS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 	$MAIN.=$GRAPH_text;
 	}
@@ -1519,6 +1521,7 @@ if ($report_display_type=="HTML") {
 	$graph_count=count($graph_array);
 	$graph_title="DROP TIME BREAKDOWN IN SECONDS";
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 	$MAIN.=$GRAPH_text;
@@ -1890,6 +1893,7 @@ if ($report_display_type=="HTML") {
 	$graph_count=count($graph_array);
 	$graph_title="CALL ANSWERED TIME BREAKDOWN";
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 	$MAIN.=$GRAPH_text;
@@ -2038,6 +2042,7 @@ if ($report_display_type=="HTML")
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("HANGUP REASON STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 	$MAIN.=$GRAPH_text;
@@ -2249,6 +2254,7 @@ $ASCII_text.="+------------------------------------------------------+----------
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL STATUS STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 ########
@@ -2399,6 +2405,7 @@ if ($report_display_type=="HTML")
 
 	$graph_count=count($graph_array);
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 	$MAIN.=$GRAPH_text;
@@ -2625,6 +2632,7 @@ if ($report_display_type=="HTML")
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL INITIAL QUEUE POSITION BREAKDOWN");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 	$MAIN.=$GRAPH_text;
@@ -2801,6 +2809,7 @@ for ($q=0; $q<count($graph_array); $q++) {
 
 $graph_count=count($graph_array);
 include("graphcanvas.inc");
+$HEADER.=$HTML_graph_head;
 $GRAPH_text.=$graphCanvas;			
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_CLOSERstats_v2.php b/agc_2-X/trunk/www/vicidial/AST_CLOSERstats_v2.php
index a60a8381..ccb43d63 100644
--- a/agc_2-X/trunk/www/vicidial/AST_CLOSERstats_v2.php
+++ b/agc_2-X/trunk/www/vicidial/AST_CLOSERstats_v2.php
@@ -62,6 +62,7 @@
 # 170324-0741 - Fix for daylight savings time issue
 # 170409-1559 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1641,6 +1642,7 @@ if ($report_display_type=="HTML") {
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("QUEUE SECONDS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text=$graphCanvas;
 
 	$MAIN.=$GRAPH_text;
@@ -1865,6 +1867,7 @@ if ($report_display_type=="HTML") {
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("DROP TIME BREAKDOWN IN SECONDS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 	$MAIN.=$GRAPH_text;
@@ -2236,6 +2239,7 @@ if ($report_display_type=="HTML") {
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL ANSWERED TIME BREAKDOWN");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 	$MAIN.=$GRAPH_text;
@@ -2384,6 +2388,7 @@ if ($report_display_type=="HTML")
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("HANGUP REASON STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 	$MAIN.=$GRAPH_text;
@@ -2594,6 +2599,7 @@ $ASCII_text.="+------------------------------------------------------+----------
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL STATUS STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 ########
@@ -2744,6 +2750,7 @@ if ($report_display_type=="HTML")
 
 	$graph_count=count($graph_array);
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 	$MAIN.=$GRAPH_text;
@@ -2971,6 +2978,7 @@ if ($report_display_type=="HTML")
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL INITIAL QUEUE POSITION BREAKDOWN");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas."<PRE>";
 
 	$MAIN.=$GRAPH_text;
@@ -3148,6 +3156,7 @@ for ($q=0; $q<count($graph_array); $q++) {
 
 $graph_count=count($graph_array);
 include("graphcanvas.inc");
+$HEADER.=$HTML_graph_head;
 $GRAPH_text.=$graphCanvas;			
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_CLOSERsummary_hourly.php b/agc_2-X/trunk/www/vicidial/AST_CLOSERsummary_hourly.php
index ca6b62de..97d67589 100644
--- a/agc_2-X/trunk/www/vicidial/AST_CLOSERsummary_hourly.php
+++ b/agc_2-X/trunk/www/vicidial/AST_CLOSERsummary_hourly.php
@@ -30,6 +30,7 @@
 # 170227-1713 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -977,6 +978,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title=" $group[$i] - $group_name[$i]<BR>"._QXZ("INBOUND SERVICE LEVEL REPORT");
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$sub_GRAPH.=$graphCanvas;
 
 
@@ -1073,6 +1075,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("INBOUND SERVICE LEVEL REPORT");
 		include("graphcanvas.inc");
+		$HEADER.=$HTML_graph_head;
 		$GRAPH.=$graphCanvas;
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_DIDstats.php b/agc_2-X/trunk/www/vicidial/AST_DIDstats.php
index 6cff704d..ae34d526 100644
--- a/agc_2-X/trunk/www/vicidial/AST_DIDstats.php
+++ b/agc_2-X/trunk/www/vicidial/AST_DIDstats.php
@@ -34,6 +34,7 @@
 # 170227-1717 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -903,6 +904,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title=_QXZ("DID Summary");
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$GRAPH_text.=$graphCanvas."<PRE>";
 
 
@@ -1086,6 +1088,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title=_QXZ("Server Summary");
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$GRAPH_text.=$graphCanvas."<PRE>";
 
 			$FtotCALLS =	sprintf("%10s", $SVtotCALLS);
@@ -1218,6 +1221,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("Date Summary");
 		include("graphcanvas.inc");
+		$HEADER.=$HTML_graph_head;
 		$GRAPH_text.=$graphCanvas."<PRE>";
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_IVRstats.php b/agc_2-X/trunk/www/vicidial/AST_IVRstats.php
index d706ffa3..12c7b991 100644
--- a/agc_2-X/trunk/www/vicidial/AST_IVRstats.php
+++ b/agc_2-X/trunk/www/vicidial/AST_IVRstats.php
@@ -38,6 +38,7 @@
 # 170227-1712 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1012,6 +1013,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL STATUS STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 	$JS_text.="</script>\n";
diff --git a/agc_2-X/trunk/www/vicidial/AST_LISTS_campaign_stats.php b/agc_2-X/trunk/www/vicidial/AST_LISTS_campaign_stats.php
index 37909b7e..12389c3b 100644
--- a/agc_2-X/trunk/www/vicidial/AST_LISTS_campaign_stats.php
+++ b/agc_2-X/trunk/www/vicidial/AST_LISTS_campaign_stats.php
@@ -29,6 +29,7 @@
 # 170227-1719 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -678,6 +679,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("LIST ID SUMMARY");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH.=$graphCanvas;
 
 
@@ -922,6 +924,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("STATUS FLAG SUMMARY");
 		include("graphcanvas.inc");
+		$HEADER.=$HTML_graph_head;
 		$GRAPH.=$graphCanvas;
 	# $OUToutput.=$GRAPH;
 
@@ -1046,6 +1049,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CUSTOM STATUS CATEGORY STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH.=$graphCanvas;
 
 	#$OUToutput.=$GRAPH;
@@ -1376,6 +1380,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title="$LISTIDlists[$i]  - $LISTIDlist_names[$i] ($LISTIDlist_active[$i])";
 		include("graphcanvas.inc");
+		$HEADER.=$HTML_graph_head;
 		$GRAPH.=$graphCanvas;
 
 		# $OUToutput.=$GRAPH;
@@ -1435,7 +1440,7 @@ else
 		echo $HEADER;
 		require("admin_header.php");
 		echo $MAIN;
-		echo $JS_text;
+		if ($report_display_type=="HTML") {echo $JS_text;}
 	}
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_LISTS_pass_report.php b/agc_2-X/trunk/www/vicidial/AST_LISTS_pass_report.php
index ee0c3256..8602c936 100644
--- a/agc_2-X/trunk/www/vicidial/AST_LISTS_pass_report.php
+++ b/agc_2-X/trunk/www/vicidial/AST_LISTS_pass_report.php
@@ -19,6 +19,7 @@
 # 170227-1711 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -548,7 +549,7 @@ $MAIN.="<PRE><FONT SIZE=2>\n\n";
 if (strlen($group[0]) < 1)
 	{
 	$MAIN.="\n\n";
-	$MAIN.=_QXZ("PLEASE SELECT A CAMPAIGN AND DATE ABOVE AND CLICK SUBMIT")."\n";
+	$MAIN.=_QXZ("PLEASE SELECT A CAMPAIGN ABOVE AND CLICK SUBMIT")."\n";
 	}
 
 else
@@ -2044,6 +2045,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("LIST ID SUMMARY");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH2.=$graphCanvas;
 
 	#########
@@ -2124,6 +2126,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("LIST ID SUMMARY 1");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH.=$graphCanvas;
 
 
@@ -2176,7 +2179,7 @@ else
 		echo $HEADER;
 		require("admin_header.php");
 		echo $MAIN;
-		echo $JS_text;
+		if ($report_display_type=="HTML") {echo $JS_text;}
 	}
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_OUTBOUNDsummary_interval.php b/agc_2-X/trunk/www/vicidial/AST_OUTBOUNDsummary_interval.php
index 49eefed5..044cd313 100644
--- a/agc_2-X/trunk/www/vicidial/AST_OUTBOUNDsummary_interval.php
+++ b/agc_2-X/trunk/www/vicidial/AST_OUTBOUNDsummary_interval.php
@@ -31,6 +31,7 @@
 # 170227-1709 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings, fixed display bug
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1522,6 +1523,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title="$group[$i] - $group_cname[$i] "._QXZ("INTERVAL BREAKDOWN");
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$SUB_HTML_text.=$graphCanvas;
 
 			$i++;
@@ -1676,6 +1678,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("MULTI-CAMPAIGN BREAKDOWN");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 	}
@@ -1730,6 +1733,7 @@ else
 			{
 			$MAIN.=$GRAPH_text;
 			$SUBoutput.=$SUB_HTML_text;
+			$SUBoutput.=$JS_text;
 			}
 		else
 			{
@@ -1741,7 +1745,6 @@ else
 		require("admin_header.php");
 		echo "$MAIN";
 		echo "$SUBoutput";
-		echo $JS_text;
 		$ENDtime = date("U");
 		$RUNtime = ($ENDtime - $STARTtime);
 		echo "\n\n"._QXZ("Run Time").": $RUNtime "._QXZ("seconds")."|$db_source\n";
diff --git a/agc_2-X/trunk/www/vicidial/AST_VDADstats.php b/agc_2-X/trunk/www/vicidial/AST_VDADstats.php
index 187fab6f..5add8c94 100644
--- a/agc_2-X/trunk/www/vicidial/AST_VDADstats.php
+++ b/agc_2-X/trunk/www/vicidial/AST_VDADstats.php
@@ -53,6 +53,7 @@
 # 170409-1555 - Added IP List validation code
 # 170629-2080 - Added download option
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1295,6 +1296,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL HANGUP REASON STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 
@@ -1579,6 +1581,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CALL STATUS STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 
@@ -1733,6 +1736,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("LIST ID STATS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 
@@ -1915,6 +1919,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("AGENT PRESET DIALS");
 		include("graphcanvas.inc");
+		$HEADER.=$HTML_graph_head;
 		$GRAPH_text.=$graphCanvas;
 
 		$TOTPREcalls =	sprintf("%10s", $TOTPREcalls); while(strlen($TOTPREcalls)>10) {$TOTPREcalls = substr("$TOTPREcalls", 0, -1);}
@@ -2056,6 +2061,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("CUSTOM STATUS CATEGORY STATS");
 		include("graphcanvas.inc");
+		$HEADER.=$HTML_graph_head;
 		$GRAPH_text.=$graphCanvas;
 
 
@@ -2288,6 +2294,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title="AGENT STATS";
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 	$GRAPH_text.="</PRE>";
diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_days_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_days_detail.php
index 8d4ea64a..44e56376 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_days_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_days_detail.php
@@ -31,6 +31,7 @@
 # 160225-1625 - Fixed download issue where report was not printing properly
 # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
 # 170409-1542 - Added IP List validation code
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -852,6 +853,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("LEAD STATS BREAKDOWN");
 		include("graphcanvas.inc");
+		echo $HTML_graph_head;
 		$GRAPH_text.=$graphCanvas;
 		
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php
index 079b058d..78baf7ee 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php
@@ -60,6 +60,7 @@
 # 161110-1830 - Fixed display issue for total averages
 # 170409-1547 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1603,6 +1604,7 @@ for ($q=0; $q<count($graph_array); $q++) {
 $graph_count=count($graph_array);
 $graph_title=_QXZ("CALL STATS BREAKDOWN: (Statistics related to handling of calls only)");
 include("graphcanvas.inc");
+$HTML_head.=$HTML_graph_head;
 $GRAPH.=$graphCanvas;
 
 $GRAPH_text.=$JS_text.$GRAPH.$GRAPH2.$GRAPH3;
@@ -2086,6 +2088,7 @@ for ($q=0; $q<count($graph_array); $q++) {
 $graph_count=count($graph_array);
 $graph_title=_QXZ("PAUSE CODE BREAKDOWN");
 include("graphcanvas.inc");
+$HTML_head.=$HTML_graph_head;
 $GRAPH.=$graphCanvas;
 $JS_text.="</script>\n";
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php
index 05ba3740..a548067e 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php
@@ -35,6 +35,7 @@
 # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
 # 170409-1556 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -993,6 +994,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("AGENT STATUS DETAIL REPORT");
 		include("graphcanvas.inc");
+		echo $HTML_graph_head;
 		$GRAPH.=$graphCanvas;
 		}
 	else
diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php
index 0e81033f..0fbb03c8 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php
@@ -52,6 +52,7 @@
 # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
 # 170409-1542 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1387,6 +1388,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("AGENT TIME DETAIL REPORT");
 		include("graphcanvas.inc");
+		echo $HTML_graph_head;
 		$GRAPH.=$graphCanvas;
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_timeclock_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_timeclock_detail.php
index 51ed1d6c..efb36725 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_timeclock_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_timeclock_detail.php
@@ -27,6 +27,7 @@
 # 170227-1726 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -892,6 +893,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title=_QXZ("AGENT TIME-CLOCK DETAIL");
 		include("graphcanvas.inc");
+		echo $HTML_graph_head;
 		$JS_text.="</script>\n";
 
 	# SPECIAL EXCEPTION FOR THIS GRAPH
diff --git a/agc_2-X/trunk/www/vicidial/AST_campaign_status_list_report.php b/agc_2-X/trunk/www/vicidial/AST_campaign_status_list_report.php
index 53f7d5c2..d60582eb 100644
--- a/agc_2-X/trunk/www/vicidial/AST_campaign_status_list_report.php
+++ b/agc_2-X/trunk/www/vicidial/AST_campaign_status_list_report.php
@@ -26,6 +26,7 @@
 # 170227-1720 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -681,6 +682,7 @@ while($i < $group_ct)
 			$graph_count=count($graph_array);
 			$graph_title=""._QXZ("List ID")." #$list_id: $list_name";
 			include("graphcanvas.inc");
+			$HTML_head.=$HTML_graph_head;
 			$GRAPH.=$graphCanvas;
 
 			}
diff --git a/agc_2-X/trunk/www/vicidial/AST_inbound_daily_report.php b/agc_2-X/trunk/www/vicidial/AST_inbound_daily_report.php
index 53bf013d..5ede4754 100644
--- a/agc_2-X/trunk/www/vicidial/AST_inbound_daily_report.php
+++ b/agc_2-X/trunk/www/vicidial/AST_inbound_daily_report.php
@@ -31,6 +31,7 @@
 # 170227-1710 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1675,6 +1676,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title=_QXZ("WEEKLY REPORT")." - $query_date_BEGIN "._QXZ("to")." $query_date_END";
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$WTD_GRAPH=$graphCanvas;			
 
 			$ASCII_text.="$MAINH\n";
@@ -1829,6 +1831,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title=_QXZ("MONTHLY REPORT")." - $query_date_BEGIN "._QXZ("to")." $query_date_END";
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$MTD_GRAPH=$graphCanvas;			
 
 			$ASCII_text.="$MAINH\n";
@@ -1996,6 +1999,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title=_QXZ("QUARTERLY REPORT")." - $query_date_BEGIN "._QXZ("to")." $query_date_END";
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$QTD_GRAPH=$graphCanvas;			
 
 
@@ -2098,6 +2102,7 @@ else
 			$graph_count=count($graph_array);
 			$graph_title=_QXZ("DAILY REPORT")." - $query_date_BEGIN "._QXZ("to")." $query_date_END";
 			include("graphcanvas.inc");
+			$HEADER.=$HTML_graph_head;
 			$GRAPH=$graphCanvas;			
 
 			$FtotAGENTS =	sprintf("%8s", $FtotAGENTS);
diff --git a/agc_2-X/trunk/www/vicidial/AST_inbound_forecasting.php b/agc_2-X/trunk/www/vicidial/AST_inbound_forecasting.php
index 5a83d300..23bf1733 100644
--- a/agc_2-X/trunk/www/vicidial/AST_inbound_forecasting.php
+++ b/agc_2-X/trunk/www/vicidial/AST_inbound_forecasting.php
@@ -8,6 +8,7 @@
 # 170428-1205 - First build
 # 170504-2245 - Minor bug fixes
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1269,6 +1270,7 @@ else
 	$hide_graph_choice="yes";
 	$override_width=900; $override_height=500;
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH.=$graphCanvas;
 
 	
diff --git a/agc_2-X/trunk/www/vicidial/AST_performance_comparison_report.php b/agc_2-X/trunk/www/vicidial/AST_performance_comparison_report.php
index 436a9af3..e950388e 100644
--- a/agc_2-X/trunk/www/vicidial/AST_performance_comparison_report.php
+++ b/agc_2-X/trunk/www/vicidial/AST_performance_comparison_report.php
@@ -17,6 +17,7 @@
 # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
 # 170409-1542 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -816,6 +817,7 @@ else
 		$graph_count=count($graph_array);
 		$graph_title="$rpt_subtitle, $rpt_date";
 		include("graphcanvas.inc");
+		$HTML_head.=$HTML_graph_head;
 		$GRAPH.=$graphCanvas;
 
 		}
@@ -992,7 +994,8 @@ if ($file_download == 0 || !$file_download)
 
 	echo $HTML_head;
 	require("admin_header.php");
-	echo $HTML_text.$JS_text;
+	echo $HTML_text;
+	if ($report_display_type=='HTML') {echo $JS_text;}
 	}
 
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php b/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php
index bd6029a0..fc4d7eea 100644
--- a/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php
@@ -30,6 +30,7 @@
 # 160718-0054 - Fixed ChartJS bug
 # 170409-1542 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1091,6 +1092,7 @@ if ( ($SUBMIT=="SUBMIT") or ($SUBMIT==_QXZ("SUBMIT")) )
 			$graph_count=count($graph_array);
 			$graph_title="$user_group[$i] - $group_name";
 			include("graphcanvas.inc");
+			$HTML_head.=$HTML_graph_head;
 			$GRAPH.=$graphCanvas;
 
 
@@ -1250,6 +1252,7 @@ if ( ($SUBMIT=="SUBMIT") or ($SUBMIT==_QXZ("SUBMIT")) )
 	$graph_count=count($graph_array);
 	$graph_title="CALL CENTER TOTAL";
 	include("graphcanvas.inc");
+	$HTML_head.=$HTML_graph_head;
 	$GRAPH.=$graphCanvas;
 
 
@@ -1290,6 +1293,7 @@ else
 	if ($report_display_type=="HTML")
 		{
 		$HTML_text.=$GRAPH_text;
+		$HTML_text.=$JS_text;
 		}
 	else
 		{
@@ -1300,7 +1304,6 @@ else
 	$short_header=1;
 	require("admin_header.php");
 	echo $HTML_text;
-	echo $JS_text;
 	flush();
 	}
 
diff --git a/agc_2-X/trunk/www/vicidial/Erlang_report.php b/agc_2-X/trunk/www/vicidial/Erlang_report.php
index f6d45f32..5cc55b4b 100644
--- a/agc_2-X/trunk/www/vicidial/Erlang_report.php
+++ b/agc_2-X/trunk/www/vicidial/Erlang_report.php
@@ -8,6 +8,7 @@
 # 170428-1205 - First build
 # 170504-2245 - Minor bug fixes
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -1308,6 +1309,7 @@ else
 	$graph_title=_QXZ("ERLANGS REPORT");
 	$hide_graph_choice="yes";
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$GRAPH.=$graphCanvas;
 
 	
diff --git a/agc_2-X/trunk/www/vicidial/fcstats.php b/agc_2-X/trunk/www/vicidial/fcstats.php
index 98ca79b1..394a74a6 100644
--- a/agc_2-X/trunk/www/vicidial/fcstats.php
+++ b/agc_2-X/trunk/www/vicidial/fcstats.php
@@ -37,6 +37,7 @@
 # 170227-1717 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -303,7 +304,7 @@ if ( (!preg_match('/\-\-ALL\-\-/i', $LOGadmin_viewable_call_times)) and (strlen(
 $NOW_DATE = date("Y-m-d");
 $NOW_TIME = date("Y-m-d H:i:s");
 $STARTtime = date("U");
-if (!isset($group)) {$group = array("CL_TEST_L");}
+if (!isset($group)) {$group = "CL_TEST_L";}
 if (!isset($query_date)) {$query_date = $NOW_DATE;}
 
 $stmt="select group_id from vicidial_inbound_groups $whereLOGadmin_viewable_groupsSQL order by group_id;";
@@ -709,6 +710,7 @@ $CSV_fronter_footer.="\""._QXZ("Average time in Queue for customers").":    $AVG
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("FRONTER STATS");
 	include("graphcanvas.inc");
+	$HTML_head.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 
@@ -968,6 +970,7 @@ $CSV_closer_footer.="\""._QXZ("TOTAL CLOSERS").":  $TOTagents\",\"$TOTcalls\",\"
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CLOSER STATS");
 	include("graphcanvas.inc");
+	$HTML_head.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 
@@ -1017,7 +1020,7 @@ else
 	echo $HTML_head;
 	require("admin_header.php");
 	echo $HTML_text;
-	echo $JS_text;
+	if ($report_display_type=="HTML") {echo $JS_text;}
 	}
 
 #$CSV_report=fopen("fcstats.csv", "w");
diff --git a/agc_2-X/trunk/www/vicidial/fcstats_detail.php b/agc_2-X/trunk/www/vicidial/fcstats_detail.php
index feaba09f..d7305e2a 100644
--- a/agc_2-X/trunk/www/vicidial/fcstats_detail.php
+++ b/agc_2-X/trunk/www/vicidial/fcstats_detail.php
@@ -39,6 +39,7 @@
 # 170409-1555 - Added IP List validation code
 # 170809-2115 - Added phone and province to detail output, fixed ASCII display issues
 # 170829-0040 - Added screen color settings
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -626,7 +627,7 @@ $HTML_text.="</TD>";
 $HTML_text.="</TR></TABLE>\n";
 $HTML_text.="</FORM>\n\n";
 
-$HTML_text.="<PRE><FONT SIZE=2>\n\n";
+$HTML_text.="<PRE><FONT SIZE=2>$report_display_type\n\n";
 
 
 if (!$group)
@@ -1116,6 +1117,7 @@ $CSV_fronter_footer.="\""._QXZ("Average time in Queue for customers").":    $AVG
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("FRONTER STATS");
 	include("graphcanvas.inc");
+	$HTML_head.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 
 
@@ -1371,11 +1373,13 @@ $CSV_closer_footer.="\""._QXZ("TOTAL CLOSERS").":  $TOTagents\",\"$TOTcalls\",\"
 		# $JS_text.="prepChart('$default_graph', $graph_id, $q, $dataset_name);\n";
 		$JS_text.="var main_ctx = document.getElementById(\"CanvasID".$graph_id."_".$q."\");\n";
 		$JS_text.="var GraphID".$graph_id."_".$q." = new Chart(main_ctx, {type: '$default_graph', $chart_options data: $dataset_name});\n";
+		echo "<!-- $JS_text //-->\n";
 	}
 
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("CLOSER STATS");
 	include("graphcanvas.inc");
+	$HTML_head.=$HTML_graph_head;
 	$GRAPH_text.=$graphCanvas;
 }
 
@@ -1425,7 +1429,7 @@ else
 	echo $HTML_head;
 	require("admin_header.php");
 	echo $HTML_text;
-	echo $JS_text;
+	if ($report_display_type=='HTML') {echo $JS_text;} 
 	}
 
 #$CSV_report=fopen("fcstats.csv", "w");
diff --git a/agc_2-X/trunk/www/vicidial/graphcanvas.inc b/agc_2-X/trunk/www/vicidial/graphcanvas.inc
index 7ebae808..f7c01037 100644
--- a/agc_2-X/trunk/www/vicidial/graphcanvas.inc
+++ b/agc_2-X/trunk/www/vicidial/graphcanvas.inc
@@ -1,4 +1,14 @@
 <?php
+# graphcanvas.inc
+# 
+# Copyright (C) 2017  Matt Florell <vicidial@gmail.com>, Joe Johnson <freewermadmin@gmail.com>    LICENSE: AGPLv2
+#
+# CHANGES
+#
+# 160731-1019 - First build
+# 171012-2015 - Fixed javascript/apache errors with graphs by removing "echo" lines
+#
+
 $graphCanvas="\n\n<form>";
 $graphCanvas.="<table cellspacing=\"1\" cellpadding=\"1\" summary=\""._QXZ("$graph_title")."\" class=\"horizontalgraph\">\n";
 $graphCanvas.="  <caption align=\"top\">"._QXZ("$graph_title")."</caption>\n";
@@ -81,16 +91,14 @@ var h = Math.floor(d / 3600); var m = Math.floor(d % 3600 / 60); var s = Math.fl
 $graphCanvas.="</td></tr>\n";
 $graphCanvas.="</table>\n";
 $graphCanvas.="</form>\n\n";
-?>
-<script language="Javascript">
-// global chart names
-<?php
+
+$HTML_graph_head="<script language=\"Javascript\">\n";
+$HTML_graph_head.="// global chart names\n";
 for ($q=0; $q<$graph_count; $q++) {
-	echo "var GraphID".$graph_id."_".$q."=null;\n";
+        $HTML_graph_head.="var GraphID".$graph_id."_".$q."=null;\n";
 }
-?>
-</script>
-<?php 
+$HTML_graph_head.="</script>\n";
+
 $allowed_graph="ALL"; 
 $graph_count=1;
 ?>
diff --git a/agc_2-X/trunk/www/vicidial/non_agent_api.php b/agc_2-X/trunk/www/vicidial/non_agent_api.php
index 4b2cf5b2..bc3c97d6 100644
--- a/agc_2-X/trunk/www/vicidial/non_agent_api.php
+++ b/agc_2-X/trunk/www/vicidial/non_agent_api.php
@@ -642,6 +642,7 @@ $REQUEST_URI = preg_replace("/'|\"|\\\\|;/","",$REQUEST_URI);
 $POST_URI = preg_replace("/'|\"|\\\\|;/","",$POST_URI);
 if ( (strlen($query_string) < 3) and (strlen($POST_URI) > 2) )
 	{$query_string = $POST_URI;}
+$barge_prefix='';
 
 $MT[0]='';
 $api_script = 'non-agent';
@@ -1752,7 +1753,7 @@ if ($function == 'blind_monitor')
 
 					$monitor_type='LISTEN'; $cid_prefix='BM';
 					if ( (preg_match('/MONITOR/',$stage)) or (strlen($stage)<1) ) {$stage = '0';}
-					if (preg_match('/BARGE/',$stage)) {$stage = ''; $monitor_type='BARGE'; $cid_prefix='BB';}
+					if (preg_match('/BARGE/',$stage)) {$stage = $barge_prefix; $monitor_type='BARGE'; $cid_prefix='BB';}
 					if (preg_match('/HIJACK/',$stage)) {$stage = ''; $monitor_type='HIJACK'; $cid_prefix='BB';}
 					if (preg_match('/WHISPER/',$stage)) 
 						{
diff --git a/agc_2-X/trunk/www/vicidial/timeclock_report.php b/agc_2-X/trunk/www/vicidial/timeclock_report.php
index 3a73cdaa..6599e7c0 100644
--- a/agc_2-X/trunk/www/vicidial/timeclock_report.php
+++ b/agc_2-X/trunk/www/vicidial/timeclock_report.php
@@ -30,6 +30,7 @@
 # 161019-2253 - Added screen colors
 # 170227-1723 - Fix for default HTML report format, issue #997
 # 170409-1555 - Added IP List validation code
+# 171012-2015 - Fixed javascript/apache errors with graphs
 #
 
 $startMS = microtime();
@@ -768,6 +769,7 @@ else
 	$graph_count=count($graph_array);
 	$graph_title=_QXZ("USER TIMECLOCK DETAILS");
 	include("graphcanvas.inc");
+	$HEADER.=$HTML_graph_head;
 	$MAIN.=$graphCanvas;
 	$JS_text.="</script>\n";