From 6e4e6286477a136fc1266f7c4afb0f76987b6d7f Mon Sep 17 00:00:00 2001
From: Colin Fleming <cj_fleming@sky.com>
Date: Wed, 3 Apr 2013 17:27:47 +0100
Subject: Tidy up "pfsense-utils.inc" XHTML

Add type to SCRIPT tag
Add CDATA section to SCRIPT tags
---
 etc/inc/pfsense-utils.inc | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 73a2b22..7c64d2f 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1721,9 +1721,12 @@ function update_output_window($text) {
 	global $pkg_interface;
 	$log = preg_replace("/\n/", "\\n", $text);
 	if($pkg_interface != "console") {
-		echo "\n<script language=\"JavaScript\">\nthis.document.forms[0].output.value = \"" . $log . "\";\n";
-		echo "this.document.forms[0].output.scrollTop = this.document.forms[0].output.scrollHeight;\n";
-		echo "</script>";
+		echo "\n<script type=\"text/javascript\">";
+		echo "\n//<![CDATA[";
+		echo "\nthis.document.forms[0].output.value = \"" . $log . "\";";
+		echo "\nthis.document.forms[0].output.scrollTop = this.document.forms[0].output.scrollHeight;";
+		echo "\n//]]>";
+		echo "\n</script>";
 	}
 	/* ensure that contents are written out */
 	ob_flush();
@@ -1737,7 +1740,11 @@ function update_status($status) {
 	if($pkg_interface == "console") {
 		echo "\r{$status}";
 	} else {
-		echo "\n<script type=\"text/javascript\">this.document.forms[0].status.value=\"" . $status . "\";</script>";
+		echo "\n<script type=\"text/javascript\">";
+		echo "\n//<![CDATA[";
+		echo "\nthis.document.forms[0].status.value=\"" . $status . "\";";
+		echo "\n//]]>";
+		echo "\n</script>";
 	}
 	/* ensure that contents are written out */
 	ob_flush();
@@ -1750,8 +1757,10 @@ function update_progress_bar($percent, $first_time) {
 	global $pkg_interface;
 	if($percent > 100) $percent = 1;
 	if($pkg_interface <> "console") {
-		echo "\n<script type=\"text/javascript\" language=\"javascript\">";
+		echo "\n<script type=\"text/javascript\">";
+		echo "\n//<![CDATA[";
 		echo "\ndocument.progressbar.style.width='" . $percent . "%';";
+		echo "\n//]]>";
 		echo "\n</script>";
 	} else {
 		if(!($first_time))
-- 
cgit v1.1