Rework layout a bit and add number of states to view as an option

1 files changed, 86 insertions, 57 deletions

diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php
index c2c8c3d..6ba81b7 100644
--- a/usr/local/www/diag_system_pftop.php
+++ b/usr/local/www/diag_system_pftop.php
@@ -46,31 +46,39 @@ $pgtitle = gettext("Diagnostics: pfTop");
 
 $sorttypes = array('age', 'bytes', 'dest', 'dport', 'exp', 'none', 'peak', 'pkt', 'rate', 'size', 'sport', 'src');
 $viewtypes = array('default', 'label', 'long', 'queue', 'rules', 'size', 'speed', 'state', 'time');
+$viewall = array('queue', 'label', 'rules');
+$numstates = array('50', '100', '200', '500', '1000', 'all');
 
 if($_REQUEST['getactivity']) {
-	if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], array_keys($sorttypes))
-		 && $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], array_keys($viewtypes))) {
+	if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes)
+		&& $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], $viewtypes)
+		&& $_REQUEST['states'] && in_array($_REQUEST['states'], $numstates)) {
 		$sorttype = escapeshellarg($_REQUEST['sorttype']);
 		$viewtype = escapeshellarg($_REQUEST['viewtype']);
+		$numstate = (in_array($_REQUEST['viewtype'], $viewall) ? "-a" : escapeshellarg($_REQUEST['states']));
 	} else {
 		$sorttype = "bytes";
 		$viewtype = "default";
+		$numstate = "100";
 	}
 
-	$text = `pftop -b -a -o {$sorttype} -v {$viewtype}`;
+	$text = `pftop -b -o {$sorttype} -v {$viewtype} $numstate`;
 	echo $text;
 	exit;
 }
 
 include("head.inc");
 
-if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], array_keys($sorttypes))
-	&& $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], array_keys($viewtypes))) {
+if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes)
+	&& $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], $viewtypes)
+	&& $_REQUEST['states'] && in_array($_REQUEST['states'], $numstates)) {
 	$sorttype = htmlentities($_REQUEST['sorttype']);
 	$viewtype = htmlentities($_REQUEST['viewtype']);
+	$numstate = (in_array($_REQUEST['viewtype'], $viewall) ? "-a" : htmlentities($_REQUEST['states']));
 } else {
 	$sorttype = "bytes";
 	$viewtype = "default";
+	$numstate = "100";
 }
 
 ?>
@@ -79,7 +87,7 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], array_keys($sorttype
 <script type="text/javascript">
 	function getpftopactivity() {
 		var url = "/diag_system_pftop.php";
-		var pars = 'getactivity=yes&sorttype=' + jQuery('#sorttype').val() + '&viewtype=' + jQuery('#viewtype').val();
+		var pars = 'getactivity=yes&sorttype=' + jQuery('#sorttype').val() + '&viewtype=' + jQuery('#viewtype').val() + '&states=' + jQuery('#states').val();
 		jQuery.ajax(
 			url,
 			{
@@ -108,55 +116,76 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], array_keys($sorttype
 		print_input_errors($input_errors);
 ?>
 	<form method="post">
-	<?=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>
-	</select>
-	<?=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>
-	</select>
-	<p/>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">  
-  <tr>
-    <td>
-	<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
-		<tr>
-			<td>
-				<center>
-				<table>
-					<tr><td>
-						<div name='pftopactivitydiv' id='pftopactivitydiv'>
-							<b><?=gettext("Gathering pfTOP activity, please wait...");?>
-						</div>
-					</td></tr>
-				</table>
-			</td>
-		</tr>
-	</table>
+		<div id="mainarea" style="padding-bottom: 0px;">
+		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+			<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>
+						</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>
+						</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>
+						</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">
+						<tr>
+							<td>
+								<center>
+									<table>
+										<tr>
+											<td>
+												<div name='pftopactivitydiv' id='pftopactivitydiv'><b><?=gettext("Gathering pfTOP activity, please wait...");?></div>
+											</td>
+										</tr>
+									</table>
+								</center>
+							</td>
+						</tr>
+					</table>
+				</td>
+		  </tr>
+		</table>
 	</div>
-    </td>
-  </tr>
-</table>
 </form>
 <?php include("fend.inc"); ?>
 <script language="JavaScript">
@@ -166,12 +195,12 @@ jQuery("#viewtype").change(function() {
 		case "queue":
 		case "label":
 		case "rules":
-			jQuery("#sorttype").hide();
+			jQuery("#sorttype, #sorttypediv, #statesdiv, #states").hide();
 			break;
 		default:
-			jQuery("#sorttype").show();
+			jQuery("#sorttype, #sorttypediv, #statesdiv, #states").show();
 	}
 });
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file