diff options
author | Colin Fleming <cj_fleming@sky.com> | 2014-05-17 14:03:50 +0100 |
---|---|---|
committer | Colin Fleming <cj_fleming@sky.com> | 2014-05-17 14:03:50 +0100 |
commit | 99f089be1ecd9d83e77e3db09e4f585b84e20ec4 (patch) | |
tree | 1380a66470c2b3a2d7a5c2814396ed34e54b6ad1 /usr | |
parent | 024068017f98572f6bd41b7ba542fc36fccee39a (diff) | |
download | pfsense-99f089be1ecd9d83e77e3db09e4f585b84e20ec4.zip pfsense-99f089be1ecd9d83e77e3db09e4f585b84e20ec4.tar.gz |
Tidy up "diag_system_pftop.php" XHTML
Move PHP include FBEGIN between BODY and SCRIPT
Add CDATA sections to SCRIPTS
Merge "face" and "size" into on FONT tag and escape closing PRE and FONT
Remove duplicate opening FORM tag
Add SUMMARY to TABLES
Update HTML Boolean operators
Remove NAME statement from DIV tag
Add missing closing DIV tag
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/diag_system_pftop.php | 82 |
1 files changed, 42 insertions, 40 deletions
diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php index a4674cb..2afcd7b 100644 --- a/usr/local/www/diag_system_pftop.php +++ b/usr/local/www/diag_system_pftop.php @@ -91,8 +91,10 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes) ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> <form method="post" action="diag_system_pftop.php"> <script type="text/javascript"> +//<![CDATA[ function getpftopactivity() { var url = "/diag_system_pftop.php"; var pars = 'getactivity=yes&sorttype=' + jQuery('#sorttype').val() + '&viewtype=' + jQuery('#viewtype').val() + '&states=' + jQuery('#states').val(); @@ -105,86 +107,83 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes) }); } function activitycallback(transport) { - jQuery('#pftopactivitydiv').html('<font face="Courier"><font size="2"><b><pre style="text-align:left;">' + transport.responseText + '</pre></font>'); + jQuery('#pftopactivitydiv').html('<font face="Courier" size="2"><pre style="text-align:left;">' + transport.responseText + '<\/pre><\/font>'); setTimeout('getpftopactivity()', 2500); } setTimeout('getpftopactivity()', 1000); +//]]> </script> -<div id='maincontent'> +<div id="maincontent"> <?php - include("fbegin.inc"); if($savemsg) { - echo "<div id='savemsg'>"; + echo "<div id=\"savemsg\">"; print_info_box($savemsg); echo "</div>"; } if ($input_errors) print_input_errors($input_errors); ?> - <form method="post"> <div id="mainarea" style="padding-bottom: 0px;"> - <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> + <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0" summary="diag system pftop"> <tr> <td class="list"> <div id='viewtypediv'><?=gettext("View type:"); ?> <select name='viewtype' id='viewtype'> - <option value='default' <?php echo ($viewtype == "default") ? "selected" : ""; ?>><?=gettext("Default");?></option> - <option value='label' <?php echo ($viewtype == "label") ? "selected" : ""; ?>><?=gettext("Label");?></option> - <option value='long' <?php echo ($viewtype == "long") ? "selected" : ""; ?>><?=gettext("Long");?></option> - <option value='queue' <?php echo ($viewtype == "queue") ? "selected" : ""; ?>><?=gettext("Queue");?></option> - <option value='rules' <?php echo ($viewtype == "rules") ? "selected" : ""; ?>><?=gettext("Rules");?></option> - <option value='size' <?php echo ($viewtype == "size") ? "selected" : ""; ?>><?=gettext("Size");?></option> - <option value='speed' <?php echo ($viewtype == "speed") ? "selected" : ""; ?>><?=gettext("Speed");?></option> - <option value='state' <?php echo ($viewtype == "state") ? "selected" : ""; ?>><?=gettext("State");?></option> - <option value='time' <?php echo ($viewtype == "time") ? "selected" : ""; ?>><?=gettext("Time");?></option> + <option value='default' <?php echo ($viewtype == "default") ? "selected=\"selected\"" : ""; ?>><?=gettext("Default");?></option> + <option value='label' <?php echo ($viewtype == "label") ? "selected=\"selected\"" : ""; ?>><?=gettext("Label");?></option> + <option value='long' <?php echo ($viewtype == "long") ? "selected=\"selected\"" : ""; ?>><?=gettext("Long");?></option> + <option value='queue' <?php echo ($viewtype == "queue") ? "selected=\"selected\"" : ""; ?>><?=gettext("Queue");?></option> + <option value='rules' <?php echo ($viewtype == "rules") ? "selected=\"selected\"" : ""; ?>><?=gettext("Rules");?></option> + <option value='size' <?php echo ($viewtype == "size") ? "selected=\"selected\"" : ""; ?>><?=gettext("Size");?></option> + <option value='speed' <?php echo ($viewtype == "speed") ? "selected=\"selected\"" : ""; ?>><?=gettext("Speed");?></option> + <option value='state' <?php echo ($viewtype == "state") ? "selected=\"selected\"" : ""; ?>><?=gettext("State");?></option> + <option value='time' <?php echo ($viewtype == "time") ? "selected=\"selected\"" : ""; ?>><?=gettext("Time");?></option> </select> </div> </td> <td class="list"> <div id='sorttypediv'><?=gettext("Sort type:"); ?> <select name='sorttype' id='sorttype'> - <option value='age' <?php echo ($sorttype == "age") ? "selected" : ""; ?>><?=gettext("Age");?></option> - <option value='bytes' <?php echo ($sorttype == "bytes") ? "selected" : ""; ?>><?=gettext("Bytes");?></option> - <option value='dest' <?php echo ($sorttype == "dest") ? "selected" : ""; ?>><?=gettext("Destination Address");?></option> - <option value='dport' <?php echo ($sorttype == "dport") ? "selected" : ""; ?>><?=gettext("Destination Port");?></option> - <option value='exp' <?php echo ($sorttype == "exp") ? "selected" : ""; ?>><?=gettext("Expiry");?></option> - <option value='none' <?php echo ($sorttype == "none") ? "selected" : ""; ?>><?=gettext("None");?></option> - <option value='peak' <?php echo ($sorttype == "peak") ? "selected" : ""; ?>><?=gettext("Peak");?></option> - <option value='pkt' <?php echo ($sorttype == "pkt") ? "selected" : ""; ?>><?=gettext("Packet");?></option> - <option value='rate' <?php echo ($sorttype == "rate") ? "selected" : ""; ?>><?=gettext("Rate");?></option> - <option value='size' <?php echo ($sorttype == "size") ? "selected" : ""; ?>><?=gettext("Size");?></option> - <option value='sport' <?php echo ($sorttype == "sport") ? "selected" : ""; ?>><?=gettext("Source Port");?></option> - <option value='src' <?php echo ($sorttype == "src") ? "selected" : ""; ?>><?=gettext("Source Address");?></option> + <option value='age' <?php echo ($sorttype == "age") ? "selected=\"selected\"" : ""; ?>><?=gettext("Age");?></option> + <option value='bytes' <?php echo ($sorttype == "bytes") ? "selected=\"selected\"" : ""; ?>><?=gettext("Bytes");?></option> + <option value='dest' <?php echo ($sorttype == "dest") ? "selected=\"selected\"" : ""; ?>><?=gettext("Destination Address");?></option> + <option value='dport' <?php echo ($sorttype == "dport") ? "selected=\"selected\"" : ""; ?>><?=gettext("Destination Port");?></option> + <option value='exp' <?php echo ($sorttype == "exp") ? "selected=\"selected\"" : ""; ?>><?=gettext("Expiry");?></option> + <option value='none' <?php echo ($sorttype == "none") ? "selected=\"selected\"" : ""; ?>><?=gettext("None");?></option> + <option value='peak' <?php echo ($sorttype == "peak") ? "selected=\"selected\"" : ""; ?>><?=gettext("Peak");?></option> + <option value='pkt' <?php echo ($sorttype == "pkt") ? "selected=\"selected\"" : ""; ?>><?=gettext("Packet");?></option> + <option value='rate' <?php echo ($sorttype == "rate") ? "selected=\"selected\"" : ""; ?>><?=gettext("Rate");?></option> + <option value='size' <?php echo ($sorttype == "size") ? "selected=\"selected\"" : ""; ?>><?=gettext("Size");?></option> + <option value='sport' <?php echo ($sorttype == "sport") ? "selected=\"selected\"" : ""; ?>><?=gettext("Source Port");?></option> + <option value='src' <?php echo ($sorttype == "src") ? "selected=\"selected\"" : ""; ?>><?=gettext("Source Address");?></option> </select> </div> </td> <td class="list"> <div id='statesdiv'><?=gettext("Number of States:"); ?> <select name='states' id='states'> - <option value='50' <?php echo ($numstate == "50") ? "selected" : ""; ?>>50</option> - <option value='100' <?php echo ($numstate == "100") ? "selected" : ""; ?>>100</option> - <option value='200' <?php echo ($numstate == "200") ? "selected" : ""; ?>>200</option> - <option value='500' <?php echo ($numstate == "500") ? "selected" : ""; ?>>500</option> - <option value='1000' <?php echo ($numstate == "1000") ? "selected" : ""; ?>>1000</option> - <option value='all' <?php echo ($numstate == "all") ? "selected" : ""; ?>>all</option> + <option value='50' <?php echo ($numstate == "50") ? "selected=\"selected\"" : ""; ?>>50</option> + <option value='100' <?php echo ($numstate == "100") ? "selected=\"selected\"" : ""; ?>>100</option> + <option value='200' <?php echo ($numstate == "200") ? "selected=\"selected\"" : ""; ?>>200</option> + <option value='500' <?php echo ($numstate == "500") ? "selected=\"selected\"" : ""; ?>>500</option> + <option value='1000' <?php echo ($numstate == "1000") ? "selected=\"selected\"" : ""; ?>>1000</option> + <option value='all' <?php echo ($numstate == "all") ? "selected=\"selected\"" : ""; ?>>all</option> </select> </div> </td> </tr> <tr> - <td colspan=3 align=center> - <table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0"> + <td colspan="3" align="center"> + <table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0" summary="tabcont"> <tr> - <td> - <center> - <table> + <td align="center"> + <table summary="results"> <tr> <td> - <div name='pftopactivitydiv' id='pftopactivitydiv'><b><?=gettext("Gathering pfTOP activity, please wait...");?></div> + <div id="pftopactivitydiv"><?=gettext("Gathering pfTOP activity, please wait...");?></div> </td> </tr> </table> - </center> </td> </tr> </table> @@ -192,9 +191,11 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes) </tr> </table> </div> +</div> </form> <?php include("fend.inc"); ?> <script type="text/javascript"> +//<![CDATA[ jQuery("#viewtype").change(function() { var selected = jQuery("#viewtype option:selected"); switch(selected.val()) { @@ -207,6 +208,7 @@ jQuery("#viewtype").change(function() { jQuery("#sorttype, #sorttypediv, #statesdiv, #states").show(); } }); +//]]> </script> </body> </html> |