XHMTL Compliance

IPsec Status Tabs
Mostly element closings and minimizations (nowrap), empty table row.

4 files changed, 50 insertions, 42 deletions

diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php
index 68f7dc8..c1e640c 100644
--- a/usr/local/www/diag_ipsec.php
+++ b/usr/local/www/diag_ipsec.php
@@ -102,21 +102,23 @@ $mobile = ipsec_dump_mobile();
 				<table width="100%" border="0" cellpadding="6" cellspacing="0" class="tabcont sortable">
 					<thead>
 					<tr>
-						<th nowrap class="listhdrr"><?php echo gettext("Local IP");?></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Remote IP");?></a></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Local Network");?></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Remote Network");?></a></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Description");?></a></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Status");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Local IP");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Remote IP");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Local Network");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Remote Network");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Description");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Status");?></th>
 					</tr>
 					</thead>
 					<tbody>
 					<?php
+						$rowIndex = 0;
 						foreach ($a_phase2 as $ph2ent) {
 							if ($ph2ent['remoteid']['type'] == "mobile")
 								continue;
 							ipsec_lookup_phase1($ph2ent,$ph1ent);
 							if (!isset($ph2ent['disabled']) && !isset($ph1ent['disabled'])) {
+								$rowIndex++;
 								if(ipsec_phase2_status($spd,$sad,$ph1ent,$ph2ent)) {
 									$icon = "pass";
 									$status = "Active";
@@ -144,7 +146,7 @@ $mobile = ipsec_dump_mobile();
 						<td class="listr"><?php echo htmlspecialchars($ph2ent['descr']);?></td>
 						<td class="listr">
 							<center>
-								<img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_<?php echo $icon; ?>.gif" title="<?php echo $status; ?>">
+								<img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_<?php echo $icon; ?>.gif" title="<?php echo $status; ?>" alt=""/>
 							</center>
 						</td>
 						<td class="list">
@@ -173,7 +175,7 @@ $mobile = ipsec_dump_mobile();
 							<?php if (($ph2ent['remoteid']['type'] != "mobile") && ($icon != "pass") && ($source != "")): ?>
 							<center>
 								<a href="diag_ipsec.php?act=connect&amp;remoteid=<?php echo $remoteid; ?>&amp;source=<?php echo $source; ?>">
-								<img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_service_start.gif" alt="Connect VPN" title="Connect VPN" border="0">
+								<img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_service_start.gif" alt="Connect VPN" title="Connect VPN" border="0"/>
 								</a>
 							</center>
 							<?php else: ?>
@@ -184,6 +186,11 @@ $mobile = ipsec_dump_mobile();
 					<?php
 							}
 						}
+						if ($rowIndex == 0) {
+					?>
+					<tr><td></td></tr>
+					<?php
+						}
 					?>
 					</tbody>
 				</table>
@@ -191,11 +198,11 @@ $mobile = ipsec_dump_mobile();
 				<table width="100%" border="0" cellpadding="6" cellspacing="0" class="tabcont sortable">
 					<thead>
 					<tr>
-						<th nowrap class="listhdrr"><?php echo gettext("Mobile User");?></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Login Time");?></a></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Local");?></th>
-						<th nowrap class="listhdrr"><?php echo gettext("Remote");?></a></th>
-						<th nowrap class="list">&nbsp;</th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Mobile User");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Login Time");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Local");?></th>
+						<th nowrap="nowrap" class="listhdrr"><?php echo gettext("Remote");?></th>
+						<th nowrap="nowrap" class="list">&nbsp;</th>
 					</tr>
 					</thead>
 					<tbody>
@@ -205,7 +212,7 @@ $mobile = ipsec_dump_mobile();
 						<td class="listr" align="center"><?php echo $muser['logintime']; ?></td>
 						<td class="listr" align="center"><?php echo $muser['local']; ?></td>
 						<td class="listr" align="center"><?php echo $muser['remote']; ?></td>
-						<td class="list" align="center"><a href="diag_ipsec.php?act=disconnect&user=<?php echo $muser['username']; ?>"><img src='/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif' height='17' width='17' border='0'/></a></td>
+						<td class="list" align="center"><a href="diag_ipsec.php?act=disconnect&user=<?php echo $muser['username']; ?>"><img src='/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif' height='17' width='17' border='0' alt=''/></a></td>
 					</tr>
 					<?php	endforeach; ?>
 					</tbody>
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index ee791dd..d34911a 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -85,14 +85,14 @@ if ($_GET['act'] == "del") {
 					<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
 						<?php if (count($sad)): ?>
 						<tr>
-							<td nowrap class="listhdrr"><?=gettext("Source");?></td>
-							<td nowrap class="listhdrr"><?=gettext("Destination");?></td>
-							<td nowrap class="listhdrr"><?=gettext("Protocol");?></td>
-							<td nowrap class="listhdrr"><?=gettext("SPI");?></td>
-							<td nowrap class="listhdrr"><?=gettext("Enc. alg.");?></td>
-							<td nowrap class="listhdr"><?=gettext("Auth. alg.");?></td>
-							<td nowrap class="listhdr"><?=gettext("Data");?></td>
-							<td nowrap class="list"></td>
+							<td nowrap="nowrap" class="listhdrr"><?=gettext("Source");?></td>
+							<td nowrap="nowrap" class="listhdrr"><?=gettext("Destination");?></td>
+							<td nowrap="nowrap" class="listhdrr"><?=gettext("Protocol");?></td>
+							<td nowrap="nowrap" class="listhdrr"><?=gettext("SPI");?></td>
+							<td nowrap="nowrap" class="listhdrr"><?=gettext("Enc. alg.");?></td>
+							<td nowrap="nowrap" class="listhdr"><?=gettext("Auth. alg.");?></td>
+							<td nowrap="nowrap" class="listhdr"><?=gettext("Data");?></td>
+							<td nowrap="nowrap" class="list"></td>
 						</tr>
 						<?php foreach ($sad as $sa): ?>
 						<tr>
@@ -103,7 +103,7 @@ if ($_GET['act'] == "del") {
 							<td class="listr"><?=htmlspecialchars($sa['ealgo']);?></td>
 							<td class="listr"><?=htmlspecialchars($sa['aalgo']);?></td>
 							<td class="listr"><?=htmlspecialchars($sa['data']);?></td>
-							<td class="list" nowrap>
+							<td class="list" nowrap="nowrap">
 								<?php
 									$args = "src=" . rawurlencode($sa['src']);
 									$args .= "&dst=" . rawurlencode($sa['dst']);
@@ -111,7 +111,7 @@ if ($_GET['act'] == "del") {
 									$args .= "&spi=" . rawurlencode("0x" . $sa['spi']);
 								?>
 								<a href="diag_ipsec_sad.php?act=del&<?=$args;?>" onclick="return confirm('<?=gettext("Do you really want to delete this security association?"); ?>')">
-									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0">
+									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt=""/>
 								</a>
 							</td>
 						</tr>
@@ -132,7 +132,7 @@ if ($_GET['act'] == "del") {
 <p/>
 
 <span class="vexpl">
-<span class="red"><strong><?=gettext("Note:");?><br></strong></span>
+<span class="red"><strong><?=gettext("Note:");?><br /></strong></span>
 <?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php"><?=gettext("here.");?></a>
 </span>
 
diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php
index 6e8dc67..3f2af7e 100755
--- a/usr/local/www/diag_ipsec_spd.php
+++ b/usr/local/www/diag_ipsec_spd.php
@@ -84,46 +84,46 @@ $spd = ipsec_dump_spd();
 					<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
 						<?php if (count($spd)): ?>
 						<tr>
-							<td nowrap class="listhdrr"><?= gettext("Source"); ?></td>
-							<td nowrap class="listhdrr"><?= gettext("Destination"); ?></td>
-							<td nowrap class="listhdrr"><?= gettext("Direction"); ?></td>
-							<td nowrap class="listhdrr"><?= gettext("Protocol"); ?></td>
-							<td nowrap class="listhdrr"><?= gettext("Tunnel endpoints"); ?></td>
-							<td nowrap class="list"></td>
+							<td nowrap="nowrap" class="listhdrr"><?= gettext("Source"); ?></td>
+							<td nowrap="nowrap" class="listhdrr"><?= gettext("Destination"); ?></td>
+							<td nowrap="nowrap" class="listhdrr"><?= gettext("Direction"); ?></td>
+							<td nowrap="nowrap" class="listhdrr"><?= gettext("Protocol"); ?></td>
+							<td nowrap="nowrap" class="listhdrr"><?= gettext("Tunnel endpoints"); ?></td>
+							<td nowrap="nowrap" class="list"></td>
 						</tr>
 						<?php foreach ($spd as $sp): ?>
 						<tr>
 							<td class="listlr" valign="top"><?=htmlspecialchars($sp['srcid']);?></td>
 							<td class="listr" valign="top"><?=htmlspecialchars($sp['dstid']);?></td>
 							<td class="listr" valign="top">
-								<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_<?=$sp['dir'];?>.gif" width="11" height="11" style="margin-top: 2px">
+								<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_<?=$sp['dir'];?>.gif" width="11" height="11" style="margin-top: 2px" alt=""/>
 							</td>
 							<td class="listr" valign="top"><?=htmlspecialchars(strtoupper($sp['proto']));?></td>
 							<td class="listr" valign="top"><?=htmlspecialchars($sp['src']);?> -> <?=htmlspecialchars($sp['dst']);?></td>
-							<td class="list" nowrap>
+							<td class="list" nowrap="nowrap">
 								<?php
 									$args = "srcid=".rawurlencode($sp['srcid']);
 									$args .= "&dstid=".rawurlencode($sp['dstid']);
 									$args .= "&dir=".rawurlencode($sp['dir']);
 								?>
 								<a href="diag_ipsec_spd.php?act=del&<?=$args;?>" onclick="return confirm('<?= gettext("Do you really want to delete this security policy?"); ?>')">
-									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0">
+									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt=""/>
 								</a>
 							</td>
 						</tr>
 						<?php endforeach; ?>
 					</table>
-					<br>
+					<br />
 					<table class="tabcont" border="0" cellspacing="0" cellpadding="6">
 						<tr>
-							<td width="16"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_in.gif" width="11" height="11"></td>
+							<td width="16"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_in.gif" width="11" height="11" alt=""/></td>
 							<td><?= gettext("incoming (as seen by firewall)"); ?></td>
 						</tr>
 						<tr>
 							<td colspan="5" height="4"></td>
 						</tr>
 						<tr>
-							<td><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_out.gif" width="11" height="11"></td>
+							<td><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_out.gif" width="11" height="11" alt=""/></td>
 							<td><?= gettext("outgoing (as seen by firewall)"); ?></td>
 						</tr>
 						<?php else: ?>
@@ -139,9 +139,10 @@ $spd = ipsec_dump_spd();
 		</tr>
 	</table>
 
-<p>
+<p/>
+
 <span class="vexpl">
-<span class="red"><strong><?= gettext("Note:"); ?><br></strong></span>
+<span class="red"><strong><?= gettext("Note:"); ?><br /></strong></span>
 <?= gettext("You can configure your IPsec"); ?> <a href="vpn_ipsec.php"><?= gettext("here."); ?></a>
 </span>
 
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index 98061bc..23b4215 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -139,16 +139,16 @@ include("head.inc");
 					$logent = preg_split("/\s+/", $logent, 6);
 					echo "<tr valign=\"top\">\n";
 					$entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3)));
-					echo "<td class=\"listlr\" nowrap>" . $entry_date_time  . "</td>\n";
+					echo "<td class=\"listlr\" nowrap=\"nowrap\">" . $entry_date_time  . "</td>\n";
 					echo "<td class=\"listr\">" . $logent[4] . " " . $logent[5] . "</td>\n";
 					echo "</tr>\n";
 				}
 				?>
 				<tr>
 					<td>
-						<br>
+						<br />
 						<form action="diag_logs_ipsec.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>