diff options
| author | Colin Fleming <cj_fleming@sky.com> | 2014-05-16 22:45:40 +0100 |
|---|---|---|
| committer | Colin Fleming <cj_fleming@sky.com> | 2014-05-16 22:45:40 +0100 |
| commit | a8590dd64eebe96c58ece0e7125cb8c2117e05af (patch) | |
| tree | e70faa6f3c7179821df01fd3a51be761749eb82c /usr/local | |
| parent | 024068017f98572f6bd41b7ba542fc36fccee39a (diff) | |
| download | pfsense-a8590dd64eebe96c58ece0e7125cb8c2117e05af.zip pfsense-a8590dd64eebe96c58ece0e7125cb8c2117e05af.tar.gz | |
Tidy up "diag_ipsec" XHTML
Add SUMMARY to TABLES
Move NOWRAP into CLASS statement
Close INPUT and IMG tags and add ALT to IMG tag
Add dummy row to TBODY but don't display it
Deprecate Ampersand in ANCHOR tag
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/diag_ipsec.php | 53 | ||||
| -rw-r--r-- | usr/local/www/diag_ipsec_sad.php | 38 | ||||
| -rw-r--r-- | usr/local/www/diag_ipsec_spd.php | 40 |
3 files changed, 65 insertions, 66 deletions
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 1b73199..02291e8 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -81,7 +81,7 @@ $status = ipsec_smp_dump_status(); <body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?php echo $jsevents["body"]["onload"]; ?>"> <?php include("fbegin.inc"); ?> <div id="inputerrors"></div> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="status ipsec"> <tr> <td> <?php @@ -97,16 +97,16 @@ $status = ipsec_smp_dump_status(); <tr> <td> <div id="mainarea"> - <table width="100%" border="0" cellpadding="6" cellspacing="0" class="tabcont sortable"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" class="tabcont sortable" summary="status"> <thead> <tr> - <th nowrap class="listhdrr"><?php echo gettext("Description");?></th> - <th nowrap class="listhdrr"><?php echo gettext("Local ID");?></th> - <th nowrap class="listhdrr"><?php echo gettext("Local IP");?></th> - <th nowrap class="listhdrr"><?php echo gettext("Remote ID");?></th> - <th nowrap class="listhdrr"><?php echo gettext("Remote IP");?></a></th> - <th nowrap class="listhdrr"><?php echo gettext("Role");?></a></th> - <th nowrap class="listhdrr"><?php echo gettext("Status");?></a></th> + <th class="listhdrr nowrap"><?php echo gettext("Description");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Local ID");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Local IP");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Remote ID");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Remote IP");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Role");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Status");?></th> </tr> </thead> <tbody> @@ -175,8 +175,8 @@ $status = ipsec_smp_dump_status(); <td class="listbg"> <?php ?> </td> - <td valign="middle" nowrap class="list"> - <table border="0" cellspacing="0" cellpadding="1"> + <td valign="middle" class="list nowrap"> + <table border="0" cellspacing="0" cellpadding="1" summary=""> </table> </td> </tr> @@ -184,15 +184,15 @@ $status = ipsec_smp_dump_status(); <tr> <td class="listrborder" colspan="7"> <div id="btnchildsa-<?=$ikeid;?>"> - <input type="button" onClick="show_childsa('childsa-<?=$ikeid;?>','btnchildsa-<?=$ikeid;?>');" value="+" /> - Show child SA entries</a> + <input type="button" onclick="show_childsa('childsa-<?=$ikeid;?>','btnchildsa-<?=$ikeid;?>');" value="+" /> - Show child SA entries </div> - <table class="tabcont" width="100%" height="100%" border="0" cellspacing="0" cellpadding="0" id="childsa-<?=$ikeid;?>" style="display:none"> + <table class="tabcont" width="100%" height="100%" border="0" cellspacing="0" cellpadding="0" id="childsa-<?=$ikeid;?>" style="display:none" summary=""> <thead> <tr> - <th nowrap class="listhdrr"><?php echo gettext("Local subnets");?></th> - <th nowrap class="listhdrr"><?php echo gettext("Local SPI");?></th> - <th nowrap class="listhdrr"><?php echo gettext("Remote SPI");?></th> - <th nowrap class="listhdrr"><?php echo gettext("Remote subnets");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Local subnets");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Local SPI");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Remote SPI");?></th> + <th class="listhdrr nowrap"><?php echo gettext("Remote subnets");?></th> </tr> </thead> <tbody> @@ -201,7 +201,7 @@ $status = ipsec_smp_dump_status(); foreach ($ikesa['childsalist']['childsa'] as $childsa) { ?> <tr valign="top"> - <td nowrap class="listlr"> + <td class="listlr nowrap"> <?php if (is_array($childsa['local']) && is_array($childsa['local']['networks']) && is_array($childsa['local']['networks']['network'])) { foreach ($childsa['local']['networks']['network'] as $lnets) { echo htmlspecialchars($lnets) . "<br />"; @@ -210,17 +210,17 @@ $status = ipsec_smp_dump_status(); echo "Unknown"; ?> </td> - <td nowrap class="listr"> + <td class="listr nowrap"> <?php if (is_array($childsa['local'])) echo htmlspecialchars($childsa['local']['spi']); ?> </td> - <td nowrap class="listr"> + <td class="listr nowrap"> <?php if (is_array($childsa['remote'])) echo htmlspecialchars($childsa['remote']['spi']); ?> </td> - <td nowrap class="listlr"> + <td class="listlr nowrap"> <?php if (is_array($childsa['remote']) && is_array($childsa['remote']['networks']) && is_array($childsa['remote']['networks']['network'])) { foreach ($childsa['remote']['networks']['network'] as $rnets) { echo htmlspecialchars($rnets) . "<br />"; @@ -229,11 +229,12 @@ $status = ipsec_smp_dump_status(); echo "Unknown"; ?> </td> - <td nowrap class="list"> + <td class="list nowrap"> </td> </tr> <?php } } ?> + <tr style="display:none;"><td></td></tr> </tbody> </table> </td> @@ -242,28 +243,30 @@ $status = ipsec_smp_dump_status(); } } ?> + <tr style="display:none;"><td></td></tr> </tbody> </table> </div> </td> </tr> </table> -</div> -<span class="vexpl"> +<p class="vexpl"> <span class="red"> <strong><?php echo gettext("Note:");?><br /></strong> </span> <?php echo gettext("You can configure IPsec");?> <a href="vpn_ipsec.php">here</a>. -</span> +</p> <?php unset($status); include("fend.inc"); ?> <script type="text/javascript"> +//<![CDATA[ function show_childsa(id, buttonid) { document.getElementById(buttonid).innerHTML=''; aodiv = document.getElementById(id); aodiv.style.display = "block"; } +//]]> </script> </body> </html> diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 55ed336..225b0a0 100644 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -66,7 +66,7 @@ if ($_GET['act'] == "del") { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="status ipsec sad"> <tr> <td> <?php @@ -82,17 +82,17 @@ if ($_GET['act'] == "del") { <tr> <td> <div id="mainarea"> - <table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0"> + <table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <?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 class="listhdrr nowrap"><?=gettext("Source");?></td> + <td class="listhdrr nowrap"><?=gettext("Destination");?></td> + <td class="listhdrr nowrap"><?=gettext("Protocol");?></td> + <td class="listhdrr nowrap"><?=gettext("SPI");?></td> + <td class="listhdrr nowrap"><?=gettext("Enc. alg.");?></td> + <td class="listhdr nowrap"><?=gettext("Auth. alg.");?></td> + <td class="listhdr nowrap"><?=gettext("Data");?></td> + <td class="list nowrap"></td> </tr> <?php foreach ($sad as $sa): ?> <tr> @@ -103,15 +103,15 @@ 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"> <?php $args = "src=" . rawurlencode($sa['src']); - $args .= "&dst=" . rawurlencode($sa['dst']); - $args .= "&proto=" . rawurlencode($sa['proto']); - $args .= "&spi=" . rawurlencode("0x" . $sa['spi']); + $args .= "&dst=" . rawurlencode($sa['dst']); + $args .= "&proto=" . rawurlencode($sa['proto']); + $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"> + <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" alt="delete" /> </a> </td> </tr> @@ -129,12 +129,10 @@ if ($_GET['act'] == "del") { </tr> </table> -<p/> - -<span class="vexpl"> +<p class="vexpl"> <span class="red"><strong><?=gettext("Note:");?><br /></strong></span> <?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php"><?=gettext("here.");?></a> -</span> +</p> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 1592d04..d156105 100644 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -65,7 +65,7 @@ $spd = ipsec_dump_spd(); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="status ipsec spd"> <tr> <td> <?php @@ -81,49 +81,49 @@ $spd = ipsec_dump_spd(); <tr> <td> <div id="mainarea" style="background:#eeeeee"> - <table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0"> + <table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <?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 class="listhdrr nowrap"><?= gettext("Source"); ?></td> + <td class="listhdrr nowrap"><?= gettext("Destination"); ?></td> + <td class="listhdrr nowrap"><?= gettext("Direction"); ?></td> + <td class="listhdrr nowrap"><?= gettext("Protocol"); ?></td> + <td class="listhdrr nowrap"><?= gettext("Tunnel endpoints"); ?></td> + <td class="list nowrap"></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="direction" /> </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"> <?php $args = "srcid=".rawurlencode($sp['srcid']); - $args .= "&dstid=".rawurlencode($sp['dstid']); - $args .= "&dir=".rawurlencode($sp['dir']); + $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"> + <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" alt="delete" /> </a> </td> </tr> <?php endforeach; ?> </table> <br /> - <table class="tabcont" border="0" cellspacing="0" cellpadding="6"> + <table class="tabcont" border="0" cellspacing="0" cellpadding="6" summary="policies"> <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="in" /></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="out" /></td> <td><?= gettext("outgoing (as seen by firewall)"); ?></td> </tr> <?php else: ?> @@ -139,13 +139,11 @@ $spd = ipsec_dump_spd(); </tr> </table> -<p> -<span class="vexpl"> +<p class="vexpl"> <span class="red"><strong><?= gettext("Note:"); ?><br /></strong></span> <?= gettext("You can configure your IPsec"); ?> <a href="vpn_ipsec.php"><?= gettext("here."); ?></a> -</span> +</p> <?php include("fend.inc"); ?> </body> </html> - |
