Fix whitespace formatting

1 files changed, 161 insertions, 165 deletions

diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
index df482e2..0f14e64 100644
--- a/usr/local/www/diag_packet_capture.php
+++ b/usr/local/www/diag_packet_capture.php
@@ -109,185 +109,181 @@ include("fbegin.inc");
 ?>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
+	<tr><td>
+	<form action="diag_packet_capture.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0">
 		<tr>
-		<td>
-			<form action="diag_packet_capture.php" method="post" name="iform" id="iform">
-			<table width="100%" border="0" cellpadding="6" cellspacing="0">
-				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("Packet capture");?></td>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Interface");?></td>
-					<td width="83%" class="vtable">
-				<select name="interface">
+			<td colspan="2" valign="top" class="listtopic"><?=gettext("Packet capture");?></td>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Interface");?></td>
+			<td width="83%" class="vtable">
+			<select name="interface">
 <?php
-					$interfaces = get_configured_interface_with_descr();
-					if (isset($config['ipsec']['enable']))
-						$interfaces['ipsec'] = "IPsec";
-					foreach (array('server', 'client') as $mode) {
-						if (is_array($config['openvpn']["openvpn-{$mode}"])) {
-							foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) {
-								if (!isset($setting['disable'])) {
-									$interfaces['ovpn' . substr($mode, 0, 1) . $setting['vpnid']] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
-								}
-							}
+			$interfaces = get_configured_interface_with_descr();
+			if (isset($config['ipsec']['enable']))
+				$interfaces['ipsec'] = "IPsec";
+			foreach (array('server', 'client') as $mode) {
+				if (is_array($config['openvpn']["openvpn-{$mode}"])) {
+					foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) {
+						if (!isset($setting['disable'])) {
+							$interfaces['ovpn' . substr($mode, 0, 1) . $setting['vpnid']] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
 						}
 					}
-					foreach ($interfaces as $iface => $ifacename): ?>
-					<option value="<?=$iface;?>" <?php if ($selectedif == $iface) echo "selected"; ?>>
-					<?php echo $ifacename;?>
-					</option>
-					<?php endforeach;?>
-					</select>
-					<br/><?=gettext("Select the interface on which to capture traffic.");?>
-					</td>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Address Family");?></td>
-					<td width="83%" class="vtable">
-					<select name="fam">
-						<option value="">Any</option>
-						<option value="ip" <?php if ($fam == "ip") echo "selected"; ?>>IPv4 Only</option>
-						<option value="ip6" <?php if ($fam == "ip6") echo "selected"; ?>>IPv6 Only</option>
-					</select>
-					<br/><?=gettext("Select the type of traffic to be captured, either Any, IPv4 only or IPv6 only.");?>
-					</td>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Host Address");?></td>
-					<td width="83%" class="vtable">
-					<input name="host" type="text" class="formfld host" id="host" size="20" value="<?=htmlspecialchars($host);?>">
-					<br/><?=gettext("This value is either the Source or Destination IP address or subnet in CIDR notation. The packet capture will look for this address in either field.");?>
-					<br/><?=gettext("This value can be a domain name or IP address, or subnet in CIDR notation.");?>
-					<br/><?=gettext("If you leave this field blank, all packets on the specified interface will be captured.");?>
-					</td>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Port");?></td>
-					<td width="83%" class="vtable">
-					<input name="port" type="text" class="formfld unknown" id="port" size="5" value="<?=$port;?>">
-					<br/><?=gettext("The port can be either the source or destination port. The packet capture will look for this port in either field.");?>
-					<br/><?=gettext("Leave blank if you do not want to filter by port.");?>
-					</td>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Packet Length");?></td>
-					<td width="83%" class="vtable">
-					<input name="snaplen" type="text" class="formfld unknown" id="snaplen" size="5" value="<?=$snaplen;?>">
-					<br/><?=gettext("The Packet length is the number of bytes of each packet that will be captured. Default value is 0, which will capture the entire frame regardless of its size.");?>
-					</td>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Count");?></td>
-					<td width="83%" class="vtable">
-					<input name="count" type="text" class="formfld unknown" id="count" size="5" value="<?=$count;?>">
-					<br/><?=gettext("This is the number of packets the packet capture will grab. Default value is 100.") . "<br/>" . gettext("Enter 0 (zero) for no count limit.");?>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Level of Detail");?></td>
-					<td width="83%" class="vtable">
-					<select name="detail" type="text" class="formselect" id="detail" size="1">
-						<option value="-q" <?php if ($detail == "-q") echo "selected"; ?>><?=gettext("Normal");?></option>
-						<option value="-v" <?php if ($detail == "-v") echo "selected"; ?>><?=gettext("Medium");?></option>
-						<option value="-vv" <?php if ($detail == "-vv") echo "selected"; ?>><?=gettext("High");?></option>
-						<option value="-vv -e" <?php if ($detail == "-vv -e") echo "selected"; ?>><?=gettext("Full");?></option>
-					</select>
-					<br/><?=gettext("This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.") .  "<br/><b>" .
-							gettext("Note:") . "</b> " .
-							gettext("This option does not affect the level of detail when downloading the packet capture.");?>
-				</tr>
-				<tr>
-					<td width="17%" valign="top" class="vncellreq"><?=gettext("Reverse DNS Lookup");?></td>
-					<td width="83%" class="vtable">
-					<input name="dnsquery" type="checkbox"<?php if($_POST['dnsquery']) echo " CHECKED"; ?>>
-					<br/><?=gettext("This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.");?>
-					<br/><b><?=gettext("Note");?>: </b><?=gettext("This option can cause delays for large packet captures.");?>
-					</td>
-				</tr>
-				<tr>
-					<td width="17%" valign="top">&nbsp;</td>
-					<td width="83%">
+				}
+			}
+			foreach ($interfaces as $iface => $ifacename): ?>
+			<option value="<?=$iface;?>" <?php if ($selectedif == $iface) echo "selected"; ?>>
+			<?php echo $ifacename;?>
+			</option>
+			<?php endforeach;?>
+			</select>
+			<br/><?=gettext("Select the interface on which to capture traffic.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Address Family");?></td>
+			<td width="83%" class="vtable">
+			<select name="fam">
+				<option value="">Any</option>
+				<option value="ip" <?php if ($fam == "ip") echo "selected"; ?>>IPv4 Only</option>
+				<option value="ip6" <?php if ($fam == "ip6") echo "selected"; ?>>IPv6 Only</option>
+			</select>
+			<br/><?=gettext("Select the type of traffic to be captured, either Any, IPv4 only or IPv6 only.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Host Address");?></td>
+			<td width="83%" class="vtable">
+			<input name="host" type="text" class="formfld host" id="host" size="20" value="<?=htmlspecialchars($host);?>">
+			<br/><?=gettext("This value is either the Source or Destination IP address or subnet in CIDR notation. The packet capture will look for this address in either field.");?>
+			<br/><?=gettext("This value can be a domain name or IP address, or subnet in CIDR notation.");?>
+			<br/><?=gettext("If you leave this field blank, all packets on the specified interface will be captured.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Port");?></td>
+			<td width="83%" class="vtable">
+			<input name="port" type="text" class="formfld unknown" id="port" size="5" value="<?=$port;?>">
+			<br/><?=gettext("The port can be either the source or destination port. The packet capture will look for this port in either field.");?>
+			<br/><?=gettext("Leave blank if you do not want to filter by port.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Packet Length");?></td>
+			<td width="83%" class="vtable">
+			<input name="snaplen" type="text" class="formfld unknown" id="snaplen" size="5" value="<?=$snaplen;?>">
+			<br/><?=gettext("The Packet length is the number of bytes of each packet that will be captured. Default value is 0, which will capture the entire frame regardless of its size.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Count");?></td>
+			<td width="83%" class="vtable">
+			<input name="count" type="text" class="formfld unknown" id="count" size="5" value="<?=$count;?>">
+			<br/><?=gettext("This is the number of packets the packet capture will grab. Default value is 100.") . "<br/>" . gettext("Enter 0 (zero) for no count limit.");?>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Level of Detail");?></td>
+			<td width="83%" class="vtable">
+			<select name="detail" type="text" class="formselect" id="detail" size="1">
+				<option value="-q" <?php if ($detail == "-q") echo "selected"; ?>><?=gettext("Normal");?></option>
+				<option value="-v" <?php if ($detail == "-v") echo "selected"; ?>><?=gettext("Medium");?></option>
+				<option value="-vv" <?php if ($detail == "-vv") echo "selected"; ?>><?=gettext("High");?></option>
+				<option value="-vv -e" <?php if ($detail == "-vv -e") echo "selected"; ?>><?=gettext("Full");?></option>
+			</select>
+			<br/><?=gettext("This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.") .  "<br/><b>" .
+					gettext("Note:") . "</b> " .
+					gettext("This option does not affect the level of detail when downloading the packet capture.");?>
+		</tr>
+		<tr>
+			<td width="17%" valign="top" class="vncellreq"><?=gettext("Reverse DNS Lookup");?></td>
+			<td width="83%" class="vtable">
+			<input name="dnsquery" type="checkbox"<?php if($_POST['dnsquery']) echo " CHECKED"; ?>>
+			<br/><?=gettext("This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.");?>
+			<br/><b><?=gettext("Note");?>: </b><?=gettext("This option can cause delays for large packet captures.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="17%" valign="top">&nbsp;</td>
+			<td width="83%">
 <?php
 
-					/* check to see if packet capture tcpdump is already running */
-					$processcheck = (trim(shell_exec("/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep {$fn} | /usr/bin/egrep -v '(pflog|grep)'")));
-
-					if ($processcheck != "")
-						$processisrunning = true;
-					else
-						$processisrunning = false;
-
-					if (($action == gettext("Stop") or $action == "") and $processisrunning != true)
-						echo "<input type=\"submit\" name=\"startbtn\" value=\"" . gettext("Start") . "\">&nbsp;";
-					else {
-						echo "<input type=\"submit\" name=\"stopbtn\" value=\"" . gettext("Stop") . "\">&nbsp;";
-					}
-					if (file_exists($fp.$fn) and $processisrunning != true) {
-						echo "<input type=\"submit\" name=\"downloadbtn\" value=\"" . gettext("Download Capture") . "\">";
-						echo "&nbsp;&nbsp;(" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")";
-					}
+			/* check to see if packet capture tcpdump is already running */
+			$processcheck = (trim(shell_exec("/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep {$fn} | /usr/bin/egrep -v '(pflog|grep)'")));
+
+			if ($processcheck != "")
+				$processisrunning = true;
+			else
+				$processisrunning = false;
+
+			if (($action == gettext("Stop") or $action == "") and $processisrunning != true)
+				echo "<input type=\"submit\" name=\"startbtn\" value=\"" . gettext("Start") . "\">&nbsp;";
+			else {
+				echo "<input type=\"submit\" name=\"stopbtn\" value=\"" . gettext("Stop") . "\">&nbsp;";
+			}
+			if (file_exists($fp.$fn) and $processisrunning != true) {
+				echo "<input type=\"submit\" name=\"downloadbtn\" value=\"" . gettext("Download Capture") . "\">";
+				echo "&nbsp;&nbsp;(" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")";
+			}
 ?>
-					</td>
-				</tr>
-				<tr>
-				<td valign="top" colspan="2">
+			</td>
+		</tr>
+		<tr>
+		<td valign="top" colspan="2">
 <?php
-				echo "<font face='terminal' size='2'>";
-				if ($processisrunning == true)
-						echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
-
-				if ($do_tcpdump) {
-					$matches = array();
-
-					if (($fam == "ip6") || ($fam == "ip"))
-						$matches[] = $fam;
-
-					if ($port != "")
-						$matches[] = "port ".$port;
-
-					if ($host != "") {
-						if (is_ipaddr($host))
-							$matches[] = "host " . $host;
-						elseif (is_subnet($host))
-							$matches[] = "net " . $host;
-					}
-
-					if ($count != "0" ) {
-						$searchcount = "-c " . $count;
-					} else {
-						$searchcount = "";
-					}
-
-					$selectedif = convert_friendly_interface_to_real_interface_name($selectedif);
-
-					if ($action == gettext("Start")) {
-						$matchstr = implode($matches, " and ");
-						echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
-						mwexec_bg ("/usr/sbin/tcpdump -i $selectedif $searchcount -s $packetlength -w $fp$fn $matchstr");
-						// echo "/usr/sbin/tcpdump -i $selectedif $searchcount -s $packetlength -w $fp$fn $matchstr";
-					} else {
-						//action = stop
-						echo("<strong>" . gettext("Packet Capture stopped.") . "<br/><br/>" . gettext("Packets Captured:") . "</strong><br/>");
+		echo "<font face='terminal' size='2'>";
+		if ($processisrunning == true)
+				echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
+
+		if ($do_tcpdump) {
+			$matches = array();
+
+			if (($fam == "ip6") || ($fam == "ip"))
+				$matches[] = $fam;
+
+			if ($port != "")
+				$matches[] = "port ".$port;
+
+			if ($host != "") {
+				if (is_ipaddr($host))
+					$matches[] = "host " . $host;
+				elseif (is_subnet($host))
+					$matches[] = "net " . $host;
+			}
+
+			if ($count != "0" ) {
+				$searchcount = "-c " . $count;
+			} else {
+				$searchcount = "";
+			}
+
+			$selectedif = convert_friendly_interface_to_real_interface_name($selectedif);
+
+			if ($action == gettext("Start")) {
+				$matchstr = implode($matches, " and ");
+				echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
+				mwexec_bg ("/usr/sbin/tcpdump -i $selectedif $searchcount -s $packetlength -w $fp$fn $matchstr");
+				// echo "/usr/sbin/tcpdump -i $selectedif $searchcount -s $packetlength -w $fp$fn $matchstr";
+			} else {
+				//action = stop
+				echo("<strong>" . gettext("Packet Capture stopped.") . "<br/><br/>" . gettext("Packets Captured:") . "</strong><br/>");
 ?>
-						<textarea style="width:98%" name="code" rows="15" cols="66" wrap="off" readonly="readonly">
+				<textarea style="width:98%" name="code" rows="15" cols="66" wrap="off" readonly="readonly">
 <?php
-						system ("/usr/sbin/tcpdump $disabledns $detail -r $fp$fn");
+				system ("/usr/sbin/tcpdump $disabledns $detail -r $fp$fn");
 
-						conf_mount_ro();
+				conf_mount_ro();
 ?>
-						</textarea>
+				</textarea>
 <?php
-					}
-				}
+			}
+		}
 ?>
-				</td>
-				</tr>
-				<tr>
-
-		</table>
-</form>
-</td>
-</tr>
+		</td>
+		</tr>
+	</table>
+	</form>
+	</td></tr>
 </table>
 
 <?php