From 631b67b7cd4c5fa00417cbe9e843892cae6f0ff6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alf=20H=C3=B8gemark?= <alf@i100.no>
Date: Sat, 15 Feb 2014 16:54:38 +0100
Subject: [PATCH] cgi-bin: HTML cleanup, add quotes for attribute values

---
 html/cgi-bin/ids.cgi       | 10 +++++-----
 html/cgi-bin/ovpnmain.cgi  |  6 +++---
 html/cgi-bin/p2p-block.cgi |  4 ++--
 html/cgi-bin/proxy.cgi     |  2 +-
 html/cgi-bin/tripwire.cgi  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 5884e2417..bd3a9dc24 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -594,7 +594,7 @@ END
 if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable_green" || -e "${General::swroot}/snort/enable_blue" || -e "${General::swroot}/snort/enable_orange" ) {
 	&Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
 		# Output display table for rule files
-		print "<table width='100%'><tr><td valign='TOP'><table>";
+		print "<table width='100%'><tr><td valign='top'><table>";
 
 		print "<form method='post'>";
 
@@ -615,7 +615,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 
 			# Check if reached half-way through rule file rules to start new column
  		if ($ruledisplaycnt > $rulecnt) {
-				print "</table></td><td valign='TOP'><table>";
+				print "</table></td><td valign='top'><table>";
 				$ruledisplaycnt = 0;
 			}
 
@@ -666,8 +666,8 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 			}
 
 			# Output rule file name and checkbox
-			print "<tr><td class='base' valign='TOP'><input type='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <a href='$rulefilelink'>$rulefile</a></td></tr>";
-			print "<tr><td class='base' valign='TOP'>";
+			print "<tr><td class='base' valign='top'><input type='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <a href='$rulefilelink'>$rulefile</a></td></tr>";
+			print "<tr><td class='base' valign='top'>";
 
 			# Check for empty 'Description'
 			if ($snortrules{$rulefile}{'Description'} eq '') {
@@ -680,7 +680,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 			# Check for display flag
 			if ($displayrulefilerules) {
 				# Rule file definition rule display
-				print "<tr><td class='base' valign='TOP'><table border='0'><tr>";
+				print "<tr><td class='base' valign='top'><table border='0'><tr>";
 
 				# Local vars
 			 	my $ruledefdisplaycnt = 0;
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index ff5b01982..3967ff83a 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2282,7 +2282,7 @@ ADV_ERROR:
     &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'});
     print <<END
     <form method='post' enctype='multipart/form-data'>
-    <table width='100%' border=0>
+    <table width='100%' border='0'>
     <tr>
 	<td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td>
     </tr>
@@ -2485,7 +2485,7 @@ if ($cgiparams{'ACTION'} eq "edit"){
 	&Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'});
 
 	print <<END
-    <table width='100%' border=0>
+    <table width='100%' border='0'>
     <tr><form method='post'>
 	<td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td>
 	<td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr>
@@ -4581,7 +4581,7 @@ END
     }	
     &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'});	
 	print <<END	
-    <table width='100%' border=0>
+    <table width='100%' border='0'>
     <form method='post'>
     <td width='25%'>&nbsp;</td>
     <td width='25%'>&nbsp;</td>
diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index eb5b8abd0..04f133142 100644
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -88,10 +88,10 @@ close FILE;
 print <<END;
 	<table width='35%' class='tbl'>
 		<tr>
-			<th align=center colspan='2'bgcolor='$color{'color22'}' >
+			<th align='center' colspan='2' bgcolor='$color{'color22'}' >
 				<b>$Lang::tr{'protocol'}</b>
 			</th>
-			<th align='center'bgcolor='$color{'color22'}' >
+			<th align='center' bgcolor='$color{'color22'}' >
 				<b>$Lang::tr{'status'}</b>
 			</th>
 		</tr>
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6f78deb09..c8f0dca77 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -1206,7 +1206,7 @@ print <<END
 	<td colspan='4'><b>$Lang::tr{'advproxy destination ports'}</b></td>
 </tr>
 <tr>
-	<td width='25%' align=center></td> <td width='20%' align=center></td><td width='25%' align=center></td><td width='30%' align=center></td>
+	<td width='25%' align='center'></td> <td width='20%' align='center'></td><td width='25%' align='center'></td><td width='30%' align='center'></td>
 </tr>
 <tr>
 	<td colspan='2' class='base'>$Lang::tr{'advproxy standard ports'}:</td>
diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi
index 696a52e1e..170bd66ca 100644
--- a/html/cgi-bin/tripwire.cgi
+++ b/html/cgi-bin/tripwire.cgi
@@ -487,7 +487,7 @@ print <<END
 <tr><td><br /></td></tr>
 <tr><td><pre>$Log</pre></td></tr>
 <tr><td><br /></td></tr>
-<tr><td align=center>$tripwiresettings{'LOG'}</td></tr>
+<tr><td align='center'>$tripwiresettings{'LOG'}</td></tr>
 </table>
 END
 ;
-- 
2.39.2