Code style www diag more bits

1 files changed, 96 insertions, 95 deletions

diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index 954d9f2..102b097 100644
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -56,7 +56,7 @@ if ($_POST || $_REQUEST['host']) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "host count");
-	$reqdfieldsn = array(gettext("Host"),gettext("Count"));
+	$reqdfieldsn = array(gettext("Host"), gettext("Count"));
 	do_input_validation($_REQUEST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if (($_REQUEST['count'] < 1) || ($_REQUEST['count'] > MAX_COUNT)) {
@@ -76,7 +76,7 @@ if ($_POST || $_REQUEST['host']) {
 		$do_ping = true;
 		$sourceip = $_REQUEST['sourceip'];
 		$count = $_POST['count'];
-		if (preg_match('/[^0-9]/', $count) ) {
+		if (preg_match('/[^0-9]/', $count)) {
 			$count = DEFAULT_COUNT;
 		}
 	}
@@ -95,103 +95,104 @@ include("head.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <form action="diag_ping.php" method="post" name="iform" id="iform">
 <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="tabcont">
-<tr>
-	<td colspan="2" valign="top" class="listtopic"><?=gettext("Ping"); ?></td>
-</tr>
-<tr>
-	<td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ?></td>
-	<td width="78%" class="vtable">
-		<?=$mandfldhtml;?><input name="host" type="text" class="formfld unknown" id="host" size="20" value="<?=htmlspecialchars($host);?>" /></td>
-</tr>
-<tr>
-	<td width="22%" valign="top" class="vncellreq"><?=gettext("IP Protocol"); ?></td>
-	<td width="78%" class="vtable">
-		<select name="ipproto" class="formselect">
-			<option value="ipv4" <?php if ($ipproto == "ipv4") echo "selected=\"selected\"" ?>>IPv4</option>
-			<option value="ipv6" <?php if ($ipproto == "ipv6") echo "selected=\"selected\"" ?>>IPv6</option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="22%" valign="top" class="vncell"><?=gettext("Source Address"); ?></td>
-	<td width="78%" class="vtable">
-		<select name="sourceip" class="formselect">
-			<option value="">Default</option>
-		<?php $sourceips = get_possible_traffic_source_addresses(true);
-			foreach ($sourceips as $sipvalue => $sipname):
-				$selected = "";
-				if (!link_interface_to_bridge($sipvalue) && ($sipvalue == $sourceip)) {
-					$selected = "selected=\"selected\"";
+	<tr>
+		<td colspan="2" valign="top" class="listtopic"><?=gettext("Ping"); ?></td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ?></td>
+		<td width="78%" class="vtable">
+			<?=$mandfldhtml;?><input name="host" type="text" class="formfld unknown" id="host" size="20" value="<?=htmlspecialchars($host);?>" />
+		</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncellreq"><?=gettext("IP Protocol"); ?></td>
+		<td width="78%" class="vtable">
+			<select name="ipproto" class="formselect">
+				<option value="ipv4" <?php if ($ipproto == "ipv4") echo "selected=\"selected\"" ?>>IPv4</option>
+				<option value="ipv6" <?php if ($ipproto == "ipv6") echo "selected=\"selected\"" ?>>IPv6</option>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncell"><?=gettext("Source Address"); ?></td>
+		<td width="78%" class="vtable">
+			<select name="sourceip" class="formselect">
+				<option value="">Default</option>
+			<?php $sourceips = get_possible_traffic_source_addresses(true);
+				foreach ($sourceips as $sipvalue => $sipname):
+					$selected = "";
+					if (!link_interface_to_bridge($sipvalue) && ($sipvalue == $sourceip)) {
+						$selected = "selected=\"selected\"";
+					}
+			?>
+				<option value="<?=$sipvalue;?>" <?=$selected;?>>
+					<?=htmlspecialchars($sipname);?>
+				</option>
+				<?php endforeach; ?>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top" class="vncellreq"><?= gettext("Count"); ?></td>
+		<td width="78%" class="vtable">
+			<select name="count" class="formfld" id="count">
+			<?php for ($i = 1; $i <= MAX_COUNT; $i++): ?>
+				<option value="<?=$i;?>" <?php if ($i == $count) echo "selected=\"selected\""; ?>><?=$i;?></option>
+			<?php endfor; ?>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top">&nbsp;</td>
+		<td width="78%">
+			<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Ping"); ?>" />
+		</td>
+	</tr>
+	<tr>
+		<td valign="top" colspan="2">
+		<?php if ($do_ping) {
+			echo "<font face=\"terminal\" size=\"2\">";
+			echo "<strong>" . gettext("Ping output") . ":</strong><br />";
+	?>
+			<script type="text/javascript">
+			//<![CDATA[
+			window.onload=function() {
+				document.getElementById("pingCaptured").wrap='off';
+			}
+			//]]>
+			</script>
+	<?php
+			echo "<textarea id=\"pingCaptured\" style=\"width:98%\" name=\"code\" rows=\"15\" cols=\"66\" readonly=\"readonly\">";
+			$ifscope = '';
+			$command = "/sbin/ping";
+			if ($ipproto == "ipv6") {
+				$command .= "6";
+				$ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ipv6($sourceip);
+				if (is_linklocal($ifaddr)) {
+					$ifscope = get_ll_scope($ifaddr);
 				}
-		?>
-			<option value="<?=$sipvalue;?>" <?=$selected;?>>
-				<?=htmlspecialchars($sipname);?>
-			</option>
-			<?php endforeach; ?>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="22%" valign="top" class="vncellreq"><?= gettext("Count"); ?></td>
-	<td width="78%" class="vtable">
-		<select name="count" class="formfld" id="count">
-		<?php for ($i = 1; $i <= MAX_COUNT; $i++): ?>
-			<option value="<?=$i;?>" <?php if ($i == $count) echo "selected=\"selected\""; ?>><?=$i;?></option>
-		<?php endfor; ?>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td width="22%" valign="top">&nbsp;</td>
-	<td width="78%">
-		<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Ping"); ?>" />
-	</td>
-</tr>
-<tr>
-	<td valign="top" colspan="2">
-	<?php if ($do_ping) {
-		echo "<font face=\"terminal\" size=\"2\">";
-		echo "<strong>" . gettext("Ping output") . ":</strong><br />";
-?>
-		<script type="text/javascript">
-		//<![CDATA[
-		window.onload=function() {
-			document.getElementById("pingCaptured").wrap='off';
-		}
-		//]]>
-		</script>
-<?php
-		echo "<textarea id=\"pingCaptured\" style=\"width:98%\" name=\"code\" rows=\"15\" cols=\"66\" readonly=\"readonly\">";
-		$ifscope = '';
-		$command = "/sbin/ping";
-		if ($ipproto == "ipv6") {
-			$command .= "6";
-			$ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ipv6($sourceip);
-			if (is_linklocal($ifaddr)) {
-				$ifscope = get_ll_scope($ifaddr);
+			} else {
+				$ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ip($sourceip);
 			}
-		} else {
-			$ifaddr = is_ipaddr($sourceip) ? $sourceip : get_interface_ip($sourceip);
-		}
-		if ($ifaddr && (is_ipaddr($host) || is_hostname($host))) {
-			$srcip = "-S" . escapeshellarg($ifaddr);
-			if (is_linklocal($host) && !strstr($host, "%") && !empty($ifscope)) {
-				$host .= "%{$ifscope}";
+			if ($ifaddr && (is_ipaddr($host) || is_hostname($host))) {
+				$srcip = "-S" . escapeshellarg($ifaddr);
+				if (is_linklocal($host) && !strstr($host, "%") && !empty($ifscope)) {
+					$host .= "%{$ifscope}";
+				}
 			}
-		}
 
-		$cmd = "{$command} {$srcip} -c" . escapeshellarg($count) . " " . escapeshellarg($host);
-		//echo "Ping command: {$cmd}\n";
-		system($cmd);
-		echo('</textarea>&nbsp;</font>');
-	}
-	?>
-	</td>
-</tr>
-<tr>
-	<td width="22%" valign="top">&nbsp;</td>
-	<td width="78%">&nbsp;</td>
-</tr>
+			$cmd = "{$command} {$srcip} -c" . escapeshellarg($count) . " " . escapeshellarg($host);
+			//echo "Ping command: {$cmd}\n";
+			system($cmd);
+			echo('</textarea>&nbsp;</font>');
+		}
+		?>
+		</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top">&nbsp;</td>
+		<td width="78%">&nbsp;</td>
+	</tr>
 </table>
 </form>
 </td></tr>