3 files changed, 22 insertions, 5 deletions
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index f22e7c3..700643f 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -228,7 +228,11 @@ if ($local_ip == false) {
 <head>
 	<link rel="stylesheet" href="/bootstrap/css/pfSense.css" />
 	<title><?=gettext("Login"); ?></title>
-	<script>var events = events || [];</script>
+	<script type="text/javascript>
+	//<![CDATA{
+	var events = events || [];
+	//]]>
+	</script>
 </head>
 <body id="login" class="no-menu">
 	<div id="jumbotron">
@@ -280,7 +284,8 @@ if ($local_ip == false) {
 			</div>
 		</div>
 
-		<script>
+		<script type="text/javascript">
+		//!<[CDATA[
 		events.push(function() {
 			document.cookie=
 				"cookie_test=1" +
@@ -294,6 +299,7 @@ if ($local_ip == false) {
 			// Delete it
 			document.cookie = "cookie_test=1; expires=Thu, 01-Jan-1970 00:00:01 GMT";
 		});
+		//]]>
 		</script>
 <?php
 require('foot.inc');
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index df2cb32..775f9a7 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1791,9 +1791,11 @@ function update_output_window($text) {
 	$log = preg_replace("/\n/", "\\n", $text);
 	if ($pkg_interface != "console") {
 ?>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	document.getElementById("output").textContent="<?=htmlspecialchars($log)?>";
 	document.getElementById("output").scrollTop = document.getElementById("output").scrollHeight;
+//]]>
 </script>
 <?php
 	}
@@ -1824,7 +1826,11 @@ function update_progress_bar($percent, $first_time) {
 		$percent = 1;
 	}
 	if ($pkg_interface <> "console") {
-		echo '<script>document.getElementById("progressbar").style.width="'. $percent.'%";</script>';
+		echo '<script type="text/javascript">';
+		echo "\n//<![CDATA[\n";
+		echo 'document.getElementById("progressbar").style.width="'. $percent.'%";'
+		echo "\n//]]>\n";
+		echo '</script>';
 	} else {
 		if (!($first_time)) {
 			echo "\x08\x08\x08\x08\x08";
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index fb00dcb..88d48fa 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -2232,7 +2232,12 @@ function post_redirect($page, $params) {
 	foreach ($params as $key => $value) {
 		print "<input type=\"hidden\" name=\"{$key}\" value=\"{$value}\" />\n";
 	}
-	print "</form><script type=\"text/javascript\">document.formredir.submit();</script>\n";
+	print "</form>\n";
+	print "<script type=\"text/javascript\">\n";
+	print "//<![CDATA[\n";
+	print "document.formredir.submit();\n";
+	print "//]]>\n";
+	print "</script>\n";
 	print "</body></html>\n";
 }