Merge pull request #942 from N0YB/RELENG_2_1

XHTML Compliance

8 files changed, 55 insertions, 55 deletions

diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
index 8d1b3ae..13fec80 100755
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -86,11 +86,10 @@ include("head.inc");
 			  <?php printf(gettext("Last %s Portal Auth log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($portal_logfile, $nentries, true); ?>
-		<tr><td><br><form action="diag_logs_auth.php" method="post">
-			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log"); ?>"></td></tr>
+		<tr><td><br/><form action="diag_logs_auth.php" method="post">
+			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log"); ?>" /></form></td></tr>
 		</table>
 	</div>
-	</form>
 	</td>
   </tr>
 </table>
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index 1988c91..29091b5 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -91,12 +91,11 @@ include("head.inc");
 			  <?php printf(gettext("Last %s DHCP service log entries"), $nentries);?></td>
 		  </tr>
 		  <?php dump_clog($dhcpd_logfile, $nentries); ?>
-		<tr><td><br><form action="diag_logs_dhcp.php" method="post">
-			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log");?>"></td>
+		<tr><td><br/><form action="diag_logs_dhcp.php" method="post">
+			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log");?>" /></form></td>
 			<td>NOTE: Clearing the log file will restart the DHCP daemon.</td></tr>
 		</table>
 	</div>
-</form>
 	</td>
   </tr>
 </table>
diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php
index f7b9fd2..f2144fb 100644
--- a/usr/local/www/diag_logs_ntpd.php
+++ b/usr/local/www/diag_logs_ntpd.php
@@ -86,12 +86,11 @@ include("head.inc");
 			  <?php printf(gettext("Last %s NTP log entries"), $nentries);?></td>
 		  </tr>
 		  <?php dump_clog($ntpd_logfile, $nentries); ?>
-		<tr><td><br>
+		<tr><td><br/>
 		<form action="diag_logs_ntpd.php" method="post">
-			<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>"></td></tr>
+			<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" /></form></td></tr>
 		</table>
 	</div>
-</form>
 	</td>
   </tr>
 </table>
diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php
index a794697..9eba7b4 100644
--- a/usr/local/www/diag_logs_openvpn.php
+++ b/usr/local/www/diag_logs_openvpn.php
@@ -92,9 +92,9 @@ include("head.inc");
 				<?php dump_clog($openvpn_logfile, $nentries); ?>
 				<tr>
 					<td>
-						<br>
+						<br/>
 						<form action="diag_logs_openvpn.php" method="post">
-						<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>">
+						<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" />
 						</form>
 					</td>
 				</tr>
diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php
index 0cd6be8..1da8907 100755
--- a/usr/local/www/diag_logs_ppp.php
+++ b/usr/local/www/diag_logs_ppp.php
@@ -90,9 +90,9 @@ include("head.inc");
 				<?php dump_clog($ppp_logfile, $nentries); ?>
 				<tr>
 					<td>
-						<br>
+						<br/>
 						<form action="diag_logs_ppp.php" method="post">
-						<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>">
+						<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" />
 						</form>
 					</td>
 				</tr>
diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php
index b7973f3..1556251 100755
--- a/usr/local/www/diag_logs_relayd.php
+++ b/usr/local/www/diag_logs_relayd.php
@@ -87,11 +87,10 @@ include("head.inc");
 			  <?php printf(gettext("Last %s Load Balancer log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($relayd_logfile, $nentries); ?>
-		<tr><td><br><form action="diag_logs_relayd.php" method="post">
-<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>"></td></tr>
+		<tr><td><br/><form action="diag_logs_relayd.php" method="post">
+<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" /></form></td></tr>
 		</table>
 	</div>
-</form>
 	</td>
   </tr>
 </table>
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
index 9c84f84..2137910 100755
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -169,7 +169,9 @@ include("head.inc");
 ?>
 
 
-<script language="JavaScript">
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+
+<script type="text/JavaScript">
 <!--
 function enable_change(enable_over) {
 	if (document.iform.enable.checked || enable_over) {
@@ -233,7 +235,6 @@ function check_everything() {
 // -->
 </script>
 
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <form action="diag_logs_settings.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
@@ -265,57 +266,57 @@ function check_everything() {
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vtable">Forward/Reverse Display</td>
-			<td width="78%" class="vtable"> <input name="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked"; ?>>
+			<td width="78%" class="vtable"> <input name="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked=\"checked\""; ?> />
 			<strong><?=gettext("Show log entries in reverse order (newest entries on top)");?></strong></td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vtable">GUI Log Entries to Display</td>
 			<td width="78%" class="vtable">
-			<input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>"><br/>
+			<input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>" /><br/>
 			<?=gettext("Hint: This is only the number of log entries displayed in the GUI. It does not affect how many entries are contained in the actual log files.") ?></td>
 		</tr>
 		<tr>
 			<td valign="top" class="vtable">Log Firewall Default Blocks</td>
 			<td class="vtable">
-				<input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked"; ?>>
+				<input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked=\"checked\""; ?> />
 				<strong><?=gettext("Log packets blocked by the default rule");?></strong><br/>
 				<?=gettext("Hint: packets that are blocked by the implicit default block rule will not be logged if you uncheck this option. Per-rule logging options are still respected.");?>
 				<br/>
-				<input name="logbogons" type="checkbox" id="logbogons" value="yes" <?php if ($pconfig['logbogons']) echo "checked"; ?>>
+				<input name="logbogons" type="checkbox" id="logbogons" value="yes" <?php if ($pconfig['logbogons']) echo "checked=\"checked\""; ?> />
 				<strong><?=gettext("Log packets blocked by 'Block Bogon Networks' rules");?></strong><br/>
 				<br/>
-				<input name="logprivatenets" type="checkbox" id="logprivatenets" value="yes" <?php if ($pconfig['logprivatenets']) echo "checked"; ?>>
+				<input name="logprivatenets" type="checkbox" id="logprivatenets" value="yes" <?php if ($pconfig['logprivatenets']) echo "checked=\"checked\""; ?> />
 				<strong><?=gettext("Log packets blocked by 'Block Private Networks' rules");?></strong><br/>
 			</td>
 		</tr>
 		<tr>
 			<td valign="top" class="vtable">Web Server Log</td>
-			<td class="vtable"> <input name="loglighttpd" type="checkbox" id="loglighttpd" value="yes" <?php if ($pconfig['loglighttpd']) echo "checked"; ?>>
-			<strong><?=gettext("Log errors from the web server process.");?></strong><br>
+			<td class="vtable"> <input name="loglighttpd" type="checkbox" id="loglighttpd" value="yes" <?php if ($pconfig['loglighttpd']) echo "checked=\"checked\""; ?> />
+			<strong><?=gettext("Log errors from the web server process.");?></strong><br/>
 			<?=gettext("Hint: If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log.");?></td>
 		</tr>
 		<tr>
 			<td valign="top" class="vtable">Raw Logs</td>
-			<td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked"; ?>>
-			<strong><?=gettext("Show raw filter logs");?></strong><br>
+			<td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked=\"checked\""; ?> />
+			<strong><?=gettext("Show raw filter logs");?></strong><br/>
 			<?=gettext("Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.");?></td>
 		</tr>
 		<tr>
 			<td valign="top" class="vtable">Filter descriptions</td>
 			<td class="vtable">
 				<select name="filterdescriptions" id="filterdescriptions" >
-				  <option value="0"<?=!isset($pconfig['filterdescriptions'])?" selected":""?>>Dont load descriptions</option>
-				  <option value="1"<?=($pconfig['filterdescriptions'])==="1"?" selected":""?>>Display as column</option>
-				  <option value="2"<?=($pconfig['filterdescriptions'])==="2"?" selected":""?>>Display as second row</option>
+				  <option value="0"<?=!isset($pconfig['filterdescriptions'])?" selected=\"selected\"":""?>>Dont load descriptions</option>
+				  <option value="1"<?=($pconfig['filterdescriptions'])==="1"?" selected=\"selected\"":""?>>Display as column</option>
+				  <option value="2"<?=($pconfig['filterdescriptions'])==="2"?" selected=\"selected\"":""?>>Display as second row</option>
 				</select>
 				<strong><?=gettext("Show the applied rule description below or in the firewall log rows.");?></strong>
 				<br/>
-				<?=gettext("Displaying rule descriptions for all lines in the log might affect performance with large rule sets.");?></td>
+				<?=gettext("Displaying rule descriptions for all lines in the log might affect performance with large rule sets.");?>
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vtable">Local Logging</td>
-			<td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked"; ?> onClick="enable_change(false)">
+			<td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
 			<?php if ($g['platform'] == "pfSense"): ?>
 			<strong><?=gettext("Disable writing log files to the local disk");?></strong></td>
 			<?php else: ?>
@@ -364,7 +365,7 @@ function check_everything() {
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Enable Remote Logging");?></td>
-			<td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
+			<td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
 				<strong><?=gettext("Send log messages to remote syslog server");?></strong></td>
 		</tr>
 		<tr>
@@ -373,53 +374,54 @@ function check_everything() {
 				<table>
 					<tr>
 						<td><?=gettext("Server") . " 1";?></td>
-						<td><input name="remoteserver" id="remoteserver" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>"></td>
+						<td><input name="remoteserver" id="remoteserver" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>" /></td>
 					</tr>
 					<tr>
 						<td><?=gettext("Server") . " 2";?></td>
-						<td><input name="remoteserver2" id="remoteserver2" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver2']);?>"></td>
+						<td><input name="remoteserver2" id="remoteserver2" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver2']);?>" /></td>
 					</tr>
 					<tr>
 						<td><?=gettext("Server") . " 3";?></td>
-						<td><input name="remoteserver3" id="remoteserver3" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver3']);?>"></td>
+						<td><input name="remoteserver3" id="remoteserver3" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver3']);?>" /></td>
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
 						<td><?=gettext("IP addresses of remote syslog servers, or an IP:port.");?></td>
+					</tr>
 				</table>
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Remote Syslog Contents");?></td>
 			<td width="78%" class="vtable">
-				<input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked"; ?> onclick="check_everything();">
+				<input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked=\"checked\""; ?> onclick="check_everything();" />
 				<?=gettext("Everything");?><br/><br/>
-				<input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked"; ?>>
+				<input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked=\"checked\""; ?> />
 				<?=gettext("System events");?><br/>
-				<input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>>
+				<input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked=\"checked\""; ?> />
 				<?=gettext("Firewall events");?><br/>
-				<input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked"; ?>>
+				<input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked=\"checked\""; ?> />
 				<?=gettext("DHCP service events");?><br/>
-				<input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked"; ?>>
+				<input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked=\"checked\""; ?> />
 				<?=gettext("Portal Auth events");?><br/>
-				<input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
+				<input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked=\"checked\""; ?> />
 				<?=gettext("VPN (PPTP, IPsec, OpenVPN) events");?><br/>
-				<input name="apinger" id="apinger" type="checkbox" value="yes" <?php if ($pconfig['apinger']) echo "checked"; ?>>
+				<input name="apinger" id="apinger" type="checkbox" value="yes" <?php if ($pconfig['apinger']) echo "checked=\"checked\""; ?> />
 				<?=gettext("Gateway Monitor events");?><br/>
-				<input name="relayd" id="relayd" type="checkbox" value="yes" <?php if ($pconfig['relayd']) echo "checked"; ?>>
+				<input name="relayd" id="relayd" type="checkbox" value="yes" <?php if ($pconfig['relayd']) echo "checked=\"checked\""; ?> />
 				<?=gettext("Server Load Balancer events");?><br/>
-				<input name="hostapd" id="hostapd" type="checkbox" value="yes" <?php if ($pconfig['hostapd']) echo "checked"; ?>>
+				<input name="hostapd" id="hostapd" type="checkbox" value="yes" <?php if ($pconfig['hostapd']) echo "checked=\"checked\""; ?> />
 				<?=gettext("Wireless events");?><br/>
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%"> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)">
+			<td width="78%"> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)" />
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" height="53" valign="top">&nbsp;</td>
-			<td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br>
+			<td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br/>
 			<?=gettext("syslog sends UDP datagrams to port 514 on the specified " .
 			"remote syslog server, unless another port is specified. Be sure to set syslogd on the " .
 			"remote server to accept syslog messages from");?> <?=$g['product_name']?>.
@@ -430,7 +432,7 @@ function check_everything() {
 </td></tr>
 </table>
 </form>
-<script language="JavaScript">
+<script type="text/JavaScript">
 <!--
 enable_change(false);
 //-->
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index 116655e..70ca4ac 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -145,26 +145,26 @@ include("head.inc");
 				"/diag_logs_vpn.php?vpntype=pptp");
 	$tab_array[] = array(gettext("PPTP Raw"),
 				(($vpntype == "pptp") && ($mode == "raw")),
-				"/diag_logs_vpn.php?vpntype=pptp&mode=raw");
+				"/diag_logs_vpn.php?vpntype=pptp&amp;mode=raw");
 	$tab_array[] = array(gettext("PPPoE Logins"),
 				(($vpntype == "poes") && ($mode != "raw")),
 				"/diag_logs_vpn.php?vpntype=poes");
 	$tab_array[] = array(gettext("PPPoE Raw"),
 				(($vpntype == "poes") && ($mode == "raw")),
-				"/diag_logs_vpn.php?vpntype=poes&mode=raw");
+				"/diag_logs_vpn.php?vpntype=poes&amp;mode=raw");
 	$tab_array[] = array(gettext("L2TP Logins"),
 				(($vpntype == "l2tp") && ($mode != "raw")),
 				"/diag_logs_vpn.php?vpntype=l2tp");
 	$tab_array[] = array(gettext("L2TP Raw"),
 				(($vpntype == "l2tp") && ($mode == "raw")),
-				"/diag_logs_vpn.php?vpntype=l2tp&mode=raw");
+				"/diag_logs_vpn.php?vpntype=l2tp&amp;mode=raw");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
   <tr>
     <td class="tabcont">
 	<form action="diag_logs_vpn.php" method="post">
-	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>
+	<table width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr>
 		<td colspan="4" class="listtopic">
 			<?php printf(gettext('Last %1$s %2$s VPN log entries'),$nentries,$vpns[$vpntype]);?></td>
@@ -182,11 +182,13 @@ include("head.inc");
 		      endif; ?>
 	</table>
 	<br />
-	<input type="hidden" name="vpntype" id="vpntype" value="<?=$vpntype;?>">
-	<input type="hidden" name="mode" id="mode" value="<?=$mode;?>">
-	<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>">
+	<input type="hidden" name="vpntype" id="vpntype" value="<?=$vpntype;?>" />
+	<input type="hidden" name="mode" id="mode" value="<?=$mode;?>" />
+	<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" />
 	</form>
 	</td>
   </tr>
 </table>
 <?php include("fend.inc"); ?>
+</body>
+</html>