Revert "Merge pull request #100 from sbeaver-netgate/halt"

This reverts commit 5bd406696ae634b3993d79a8b9aef03eeab42488, reversing
changes made to b9bd62735f2afb818d9ff3afd399c6c7d3b904c5.

1 files changed, 112 insertions, 138 deletions

diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php
index f5cc443..f80107a 100644
--- a/usr/local/www/diag_system_pftop.php
+++ b/usr/local/www/diag_system_pftop.php
@@ -1,31 +1,31 @@
 <?php
 /* $Id$ */
 /*
-    diag_system_pftop.php
-    Copyright (C) 2008-2009 Scott Ullrich
-    Copyright (C) 2013-2015 Electric Sheep Fencing, LP
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
+	diag_system_pftop.php
+	Copyright (C) 2008-2009 Scott Ullrich
+	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
 */
 
 /*
@@ -67,7 +67,7 @@ if($_REQUEST['getactivity']) {
 	}
 
 	$text = `pftop -b {$sorttype} -v {$viewtype} {$numstate}`;
-	echo $text;
+	echo trim($text);
 	exit;
 }
 
@@ -90,126 +90,100 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes)
 	$numstate = "100";
 }
 
+if ($input_errors)
+	print_input_errors($input_errors);
+
+require('classes/Form.class.php');
+$form = new Form(false);
+$form->addGlobal(new Form_Input(
+	'getactivity',
+	null,
+	'hidden',
+	'yes'
+));
+$section = new Form_Section('pfTop Configuration');
+
+$validViews = array(
+	'default', 'label', 'long',
+	'queue', 'rules', 'size',
+	'speed', 'state', 'time',
+);
+$section->addInput(new Form_Select(
+	'viewtype',
+	'View',
+	$viewtype,
+	array_combine($validViews, $validViews)
+));
+
+$section->addInput(new Form_Select(
+	'sorttype',
+	'Sort by',
+	$sorttype,
+	array(
+		'none' => 'None',
+		'age' => 'Age',
+		'bytes' => 'Bytes',
+		'dest' => 'Destination Address',
+		'dport' => 'Destination Port',
+		'exp' => 'Expiry',
+		'peak' => 'Peak',
+		'pkt' => 'Packet',
+		'rate' => 'Rate',
+		'size' => 'Size',
+		'sport' => 'Source Port',
+		'src' => 'Source Address',
+	)
+));
+
+$validStates = array(50, 100, 200, 500, 100, 'all');
+$section->addInput(new Form_Select(
+	'states',
+	'Maximum # of States',
+	$numstate,
+	array_combine($validStates, $validStates)
+));
+
+$form->add($section);
+print $form;
 ?>
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<form method="post" action="diag_system_pftop.php">
-<script type="text/javascript">
-//<![CDATA[
+
+<script>
 	function getpftopactivity() {
-		var url = "/diag_system_pftop.php";
-		var pars = 'getactivity=yes&sorttype=' + jQuery('#sorttype').val() + '&viewtype=' + jQuery('#viewtype').val() + '&states=' + jQuery('#states').val();
-		jQuery.ajax(
-			url,
+		$.ajax(
+			'/diag_system_pftop.php',
 			{
-				type: 'post',
-				data: pars,
-				complete: activitycallback
-			});
+				method: 'post',
+				data: $(document.forms[0]).serialize(),
+				dataType: "html",
+				success: function (data) {
+					$('#xhrOutput').html(data);
+				},
+			}
+		);
 	}
-	function activitycallback(transport) {
-		jQuery('#pftopactivitydiv').html('<font face="Courier" size="2"><pre style="text-align:left;">' + transport.responseText  + '<\/pre><\/font>');
-		setTimeout('getpftopactivity()', 2500);
-	}
-	setTimeout('getpftopactivity()', 1000);
-//]]>
+
+	events.push(function(){
+		setInterval('getpftopactivity()', 2500);
+		getpftopactivity();
+	});
 </script>
-<div id="maincontent">
 <?php
-	if($savemsg) {
-		echo "<div id=\"savemsg\">";
-		print_info_box($savemsg);
-		echo "</div>";	
-	}
-	if ($input_errors)
-		print_input_errors($input_errors);
 ?>
-		<div id="mainarea" style="padding-bottom: 0px;">
-		<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=\"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=\"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=\"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" summary="tabcont">
-						<tr>
-							<td align="center">
-									<table summary="results">
-										<tr>
-											<td>
-												<div id="pftopactivitydiv"><?=gettext("Gathering pfTOP activity, please wait...");?></div>
-											</td>
-										</tr>
-									</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-		  </tr>
-		</table>
+<div class="panel panel-default">
+	<div class="panel-heading"><?=gettext('Output')?></div>
+	<div class="panel panel-body">
+		<pre id="xhrOutput"><?=gettext("Gathering pfTOP activity, please wait...")?></pre>
 	</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()) {
-		case "queue":
-		case "label":
-		case "rules":
-			jQuery("#sorttype, #sorttypediv, #statesdiv, #states").hide();
-			break;
-		default:
-			jQuery("#sorttype, #sorttypediv, #statesdiv, #states").show();
-	}
+
+<script>
+events.push(function(){
+	$('#viewtype').on('change', function(){
+		if (['queue', 'label', 'rules'].indexOf($(this).val()) > -1)
+			$("#sorttype, #sorttypediv, #statesdiv, #states").parents('.form-group').hide();
+		else
+			$("#sorttype, #sorttypediv, #statesdiv, #states").parents('.form-group').show();
+	});
 });
-//]]>
 </script>
-</body>
-</html>
+<?php include("foot.inc");
\ No newline at end of file