Code style interfaces miscellaneous files

1 files changed, 56 insertions, 45 deletions

diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php
index 273c547..a3f481e 100644
--- a/usr/local/www/interfaces_vlan.php
+++ b/usr/local/www/interfaces_vlan.php
@@ -43,8 +43,9 @@
 
 require("guiconfig.inc");
 
-if (!is_array($config['vlans']['vlan']))
+if (!is_array($config['vlans']['vlan'])) {
 	$config['vlans']['vlan'] = array();
+}
 
 $a_vlans = &$config['vlans']['vlan'] ;
 
@@ -53,24 +54,26 @@ function vlan_inuse($num) {
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
-		if ($config['interfaces'][$if]['if'] == $a_vlans[$num]['vlanif'])
+		if ($config['interfaces'][$if]['if'] == $a_vlans[$num]['vlanif']) {
 			return true;
+		}
 	}
 
 	return false;
 }
 
 if ($_GET['act'] == "del") {
-        if (!isset($_GET['id']))
-                $input_errors[] = gettext("Wrong parameters supplied");
-        else if (empty($a_vlans[$_GET['id']]))
-                $input_errors[] = gettext("Wrong index supplied");
+	if (!isset($_GET['id'])) {
+		$input_errors[] = gettext("Wrong parameters supplied");
+	} else if (empty($a_vlans[$_GET['id']])) {
+		$input_errors[] = gettext("Wrong index supplied");
 	/* check if still in use */
-	else if (vlan_inuse($_GET['id'])) {
+	} else if (vlan_inuse($_GET['id'])) {
 		$input_errors[] = gettext("This VLAN cannot be deleted because it is still being used as an interface.");
 	} else {
-		if (does_interface_exist($a_vlans[$_GET['id']]['vlanif']))
+		if (does_interface_exist($a_vlans[$_GET['id']]['vlanif'])) {
 			pfSense_interface_destroy($a_vlans[$_GET['id']]['vlanif']);
+		}
 		unset($a_vlans[$_GET['id']]);
 
 		write_config();
@@ -91,7 +94,7 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="interfaces vlan">
-  <tr><td>
+	<tr><td>
 <?php
 	$tab_array = array();
 	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
@@ -106,47 +109,55 @@ include("head.inc");
 	$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
-                <tr>
-                  <td width="20%" class="listhdrr"><?=gettext("Interface");?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("VLAN tag");?></td>
-                  <td width="50%" class="listhdr"><?=gettext("Description");?></td>
-                  <td width="10%" class="list"></td>
+	</td></tr>
+	<tr>
+		<td>
+			<div id="mainarea">
+			<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
+				<tr>
+					<td width="20%" class="listhdrr"><?=gettext("Interface");?></td>
+					<td width="20%" class="listhdrr"><?=gettext("VLAN tag");?></td>
+					<td width="50%" class="listhdr"><?=gettext("Description");?></td>
+					<td width="10%" class="list"></td>
 				</tr>
-			  <?php $i = 0; foreach ($a_vlans as $vlan): ?>
-                <tr ondblclick="document.location='interfaces_vlan_edit.php?id=<?=$i;?>'">
-                  <td class="listlr">
-					<?=htmlspecialchars($vlan['if']);?>
-                  </td>
-                  <td class="listr">
-					<?=htmlspecialchars($vlan['tag']);?>
-                  </td>
-                  <td class="listbg">
-                    <?=htmlspecialchars($vlan['descr']);?>&nbsp;
-                  </td>
-                  <td valign="middle" class="list nowrap"> <a href="interfaces_vlan_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
-                     &nbsp;<a href="interfaces_vlan.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this VLAN?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+<?php
+	$i = 0;
+	foreach ($a_vlans as $vlan):
+?>
+				<tr ondblclick="document.location='interfaces_vlan_edit.php?id=<?=$i;?>'">
+					<td class="listlr">
+						<?=htmlspecialchars($vlan['if']);?>
+					</td>
+					<td class="listr">
+						<?=htmlspecialchars($vlan['tag']);?>
+					</td>
+					<td class="listbg">
+						<?=htmlspecialchars($vlan['descr']);?>&nbsp;
+					</td>
+					<td valign="middle" class="list nowrap"> <a href="interfaces_vlan_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
+						&nbsp;<a href="interfaces_vlan.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this VLAN?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a>
+					</td>
 				</tr>
-			  <?php $i++; endforeach; ?>
-                <tr>
-                  <td class="list" colspan="3">&nbsp;</td>
-                  <td class="list"> <a href="interfaces_vlan_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+<?php
+		$i++;
+	endforeach;
+?>
+				<tr>
+					<td class="list" colspan="3">&nbsp;</td>
+					<td class="list"> <a href="interfaces_vlan_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
 				</tr>
 				<tr>
-				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:");?><br />
-				  </strong></span>
-				  <?php printf(gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."),$g['product_name']);?> </p>
-				  </td>
-				<td class="list">&nbsp;</td>
+					<td colspan="3" class="list"><p class="vexpl">
+						<span class="red"><strong>
+							<?=gettext("Note:");?><br />
+						</strong></span>
+						<?php printf(gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."),$g['product_name']);?> </p>
+					</td>
+					<td class="list">&nbsp;</td>
 				</tr>
-              </table>
-	      </div>
-	</td>
+			</table>
+			</div>
+		</td>
 	</tr>
 </table>
 <?php include("fend.inc"); ?>