Project

General

Profile

« Previous | Next » 

Revision 38de3c9d

Added by Warren Baker over 12 years ago

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

View differences:

usr/local/www/diag_system_pftop.php
46 46

  
47 47
$sorttypes = array('age', 'bytes', 'dest', 'dport', 'exp', 'none', 'peak', 'pkt', 'rate', 'size', 'sport', 'src');
48 48
$viewtypes = array('default', 'label', 'long', 'queue', 'rules', 'size', 'speed', 'state', 'time');
49
$viewall = array('queue', 'label', 'rules');
50
$numstates = array('50', '100', '200', '500', '1000', 'all');
49 51

  
50 52
if($_REQUEST['getactivity']) {
51
	if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], array_keys($sorttypes))
52
		 && $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], array_keys($viewtypes))) {
53
	if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes)
54
		&& $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], $viewtypes)
55
		&& $_REQUEST['states'] && in_array($_REQUEST['states'], $numstates)) {
53 56
		$sorttype = escapeshellarg($_REQUEST['sorttype']);
54 57
		$viewtype = escapeshellarg($_REQUEST['viewtype']);
58
		$numstate = (in_array($_REQUEST['viewtype'], $viewall) ? "-a" : escapeshellarg($_REQUEST['states']));
55 59
	} else {
56 60
		$sorttype = "bytes";
57 61
		$viewtype = "default";
62
		$numstate = "100";
58 63
	}
59 64

  
60
	$text = `pftop -b -a -o {$sorttype} -v {$viewtype}`;
65
	$text = `pftop -b -o {$sorttype} -v {$viewtype} $numstate`;
61 66
	echo $text;
62 67
	exit;
63 68
}
64 69

  
65 70
include("head.inc");
66 71

  
67
if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], array_keys($sorttypes))
68
	&& $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], array_keys($viewtypes))) {
72
if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes)
73
	&& $_REQUEST['viewtype'] && in_array($_REQUEST['viewtype'], $viewtypes)
74
	&& $_REQUEST['states'] && in_array($_REQUEST['states'], $numstates)) {
69 75
	$sorttype = htmlentities($_REQUEST['sorttype']);
70 76
	$viewtype = htmlentities($_REQUEST['viewtype']);
77
	$numstate = (in_array($_REQUEST['viewtype'], $viewall) ? "-a" : htmlentities($_REQUEST['states']));
71 78
} else {
72 79
	$sorttype = "bytes";
73 80
	$viewtype = "default";
81
	$numstate = "100";
74 82
}
75 83

  
76 84
?>
......
79 87
<script type="text/javascript">
80 88
	function getpftopactivity() {
81 89
		var url = "/diag_system_pftop.php";
82
		var pars = 'getactivity=yes&sorttype=' + jQuery('#sorttype').val() + '&viewtype=' + jQuery('#viewtype').val();
90
		var pars = 'getactivity=yes&sorttype=' + jQuery('#sorttype').val() + '&viewtype=' + jQuery('#viewtype').val() + '&states=' + jQuery('#states').val();
83 91
		jQuery.ajax(
84 92
			url,
85 93
			{
......
108 116
		print_input_errors($input_errors);
109 117
?>
110 118
	<form method="post">
111
	<?=gettext("View type:"); ?>
112
	<select name='viewtype' id='viewtype'>
113
		<option value='default' <?php echo ($viewtype == "default") ? "selected" : ""; ?>><?=gettext("Default");?></option>
114
		<option value='label' <?php echo ($viewtype == "label") ? "selected" : ""; ?>><?=gettext("Label");?></option>
115
		<option value='long' <?php echo ($viewtype == "long") ? "selected" : ""; ?>><?=gettext("Long");?></option>
116
		<option value='queue' <?php echo ($viewtype == "queue") ? "selected" : ""; ?>><?=gettext("Queue");?></option>
117
		<option value='rules' <?php echo ($viewtype == "rules") ? "selected" : ""; ?>><?=gettext("Rules");?></option>
118
		<option value='size' <?php echo ($viewtype == "size") ? "selected" : ""; ?>><?=gettext("Size");?></option>
119
		<option value='speed' <?php echo ($viewtype == "speed") ? "selected" : ""; ?>><?=gettext("Speed");?></option>
120
		<option value='state' <?php echo ($viewtype == "state") ? "selected" : ""; ?>><?=gettext("State");?></option>
121
		<option value='time' <?php echo ($viewtype == "time") ? "selected" : ""; ?>><?=gettext("Time");?></option>
122
	</select>
123
	<?=gettext("Sort type:"); ?>
124
	<select name='sorttype' id='sorttype'>
125
		<option value='age' <?php echo ($sorttype == "age") ? "selected" : ""; ?>><?=gettext("Age");?></option>
126
		<option value='bytes' <?php echo ($sorttype == "bytes") ? "selected" : ""; ?>><?=gettext("Bytes");?></option>
127
		<option value='dest' <?php echo ($sorttype == "dest") ? "selected" : ""; ?>><?=gettext("Destination Address");?></option>
128
		<option value='dport' <?php echo ($sorttype == "dport") ? "selected" : ""; ?>><?=gettext("Destination Port");?></option>
129
		<option value='exp' <?php echo ($sorttype == "exp") ? "selected" : ""; ?>><?=gettext("Expiry");?></option>
130
		<option value='none' <?php echo ($sorttype == "none") ? "selected" : ""; ?>><?=gettext("None");?></option>
131
		<option value='peak' <?php echo ($sorttype == "peak") ? "selected" : ""; ?>><?=gettext("Peak");?></option>
132
		<option value='pkt' <?php echo ($sorttype == "pkt") ? "selected" : ""; ?>><?=gettext("Packet");?></option>
133
		<option value='rate' <?php echo ($sorttype == "rate") ? "selected" : ""; ?>><?=gettext("Rate");?></option>
134
		<option value='size' <?php echo ($sorttype == "size") ? "selected" : ""; ?>><?=gettext("Size");?></option>
135
		<option value='sport' <?php echo ($sorttype == "sport") ? "selected" : ""; ?>><?=gettext("Source Port");?></option>
136
		<option value='src' <?php echo ($sorttype == "src") ? "selected" : ""; ?>><?=gettext("Source Address");?></option>
137
	</select>
138
	<p/>
139
<table width="100%" border="0" cellpadding="0" cellspacing="0">  
140
  <tr>
141
    <td>
142
	<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
143
		<tr>
144
			<td>
145
				<center>
146
				<table>
147
					<tr><td>
148
						<div name='pftopactivitydiv' id='pftopactivitydiv'>
149
							<b><?=gettext("Gathering pfTOP activity, please wait...");?>
150
						</div>
151
					</td></tr>
152
				</table>
153
			</td>
154
		</tr>
155
	</table>
119
		<div id="mainarea" style="padding-bottom: 0px;">
120
		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
121
			<tr>
122
				<td class="list">
123
					<div id='viewtypediv'><?=gettext("View type:"); ?>
124
						<select name='viewtype' id='viewtype'>
125
							<option value='default' <?php echo ($viewtype == "default") ? "selected" : ""; ?>><?=gettext("Default");?></option>
126
							<option value='label' <?php echo ($viewtype == "label") ? "selected" : ""; ?>><?=gettext("Label");?></option>
127
							<option value='long' <?php echo ($viewtype == "long") ? "selected" : ""; ?>><?=gettext("Long");?></option>
128
							<option value='queue' <?php echo ($viewtype == "queue") ? "selected" : ""; ?>><?=gettext("Queue");?></option>
129
							<option value='rules' <?php echo ($viewtype == "rules") ? "selected" : ""; ?>><?=gettext("Rules");?></option>
130
							<option value='size' <?php echo ($viewtype == "size") ? "selected" : ""; ?>><?=gettext("Size");?></option>
131
							<option value='speed' <?php echo ($viewtype == "speed") ? "selected" : ""; ?>><?=gettext("Speed");?></option>
132
							<option value='state' <?php echo ($viewtype == "state") ? "selected" : ""; ?>><?=gettext("State");?></option>
133
							<option value='time' <?php echo ($viewtype == "time") ? "selected" : ""; ?>><?=gettext("Time");?></option>
134
						</select>
135
					</div>
136
				</td>
137
				<td class="list">
138
					<div id='sorttypediv'><?=gettext("Sort type:"); ?>
139
						<select name='sorttype' id='sorttype'>
140
							<option value='age' <?php echo ($sorttype == "age") ? "selected" : ""; ?>><?=gettext("Age");?></option>
141
							<option value='bytes' <?php echo ($sorttype == "bytes") ? "selected" : ""; ?>><?=gettext("Bytes");?></option>
142
							<option value='dest' <?php echo ($sorttype == "dest") ? "selected" : ""; ?>><?=gettext("Destination Address");?></option>
143
							<option value='dport' <?php echo ($sorttype == "dport") ? "selected" : ""; ?>><?=gettext("Destination Port");?></option>
144
							<option value='exp' <?php echo ($sorttype == "exp") ? "selected" : ""; ?>><?=gettext("Expiry");?></option>
145
							<option value='none' <?php echo ($sorttype == "none") ? "selected" : ""; ?>><?=gettext("None");?></option>
146
							<option value='peak' <?php echo ($sorttype == "peak") ? "selected" : ""; ?>><?=gettext("Peak");?></option>
147
							<option value='pkt' <?php echo ($sorttype == "pkt") ? "selected" : ""; ?>><?=gettext("Packet");?></option>
148
							<option value='rate' <?php echo ($sorttype == "rate") ? "selected" : ""; ?>><?=gettext("Rate");?></option>
149
							<option value='size' <?php echo ($sorttype == "size") ? "selected" : ""; ?>><?=gettext("Size");?></option>
150
							<option value='sport' <?php echo ($sorttype == "sport") ? "selected" : ""; ?>><?=gettext("Source Port");?></option>
151
							<option value='src' <?php echo ($sorttype == "src") ? "selected" : ""; ?>><?=gettext("Source Address");?></option>
152
						</select>
153
					</div>
154
				</td>
155
				<td class="list">
156
					<div id='statesdiv'><?=gettext("Number of States:"); ?>
157
						<select name='states' id='states'>
158
							<option value='50' <?php echo ($numstate == "50") ? "selected" : ""; ?>>50</option>
159
							<option value='100' <?php echo ($numstate == "100") ? "selected" : ""; ?>>100</option>
160
							<option value='200' <?php echo ($numstate == "200") ? "selected" : ""; ?>>200</option>
161
							<option value='500' <?php echo ($numstate == "500") ? "selected" : ""; ?>>500</option>
162
							<option value='1000' <?php echo ($numstate == "1000") ? "selected" : ""; ?>>1000</option>
163
							<option value='all' <?php echo ($numstate == "all") ? "selected" : ""; ?>>all</option>
164
						</select>
165
					</div>
166
				</td>
167
			</tr>
168
			<tr>
169
				<td colspan=3 align=center>
170
					<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
171
						<tr>
172
							<td>
173
								<center>
174
									<table>
175
										<tr>
176
											<td>
177
												<div name='pftopactivitydiv' id='pftopactivitydiv'><b><?=gettext("Gathering pfTOP activity, please wait...");?></div>
178
											</td>
179
										</tr>
180
									</table>
181
								</center>
182
							</td>
183
						</tr>
184
					</table>
185
				</td>
186
		  </tr>
187
		</table>
156 188
	</div>
157
    </td>
158
  </tr>
159
</table>
160 189
</form>
161 190
<?php include("fend.inc"); ?>
162 191
<script language="JavaScript">
......
166 195
		case "queue":
167 196
		case "label":
168 197
		case "rules":
169
			jQuery("#sorttype").hide();
198
			jQuery("#sorttype, #sorttypediv, #statesdiv, #states").hide();
170 199
			break;
171 200
		default:
172
			jQuery("#sorttype").show();
201
			jQuery("#sorttype, #sorttypediv, #statesdiv, #states").show();
173 202
	}
174 203
});
175 204
</script>
176 205
</body>
177
</html>
206
</html>

Also available in: Unified diff