Code style interfaces miscellaneous files

1 files changed, 83 insertions, 66 deletions

diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 4395d12..eeb3c47 100644
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -44,8 +44,9 @@ require("guiconfig.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_vlan.php');
 
-if (!is_array($config['vlans']['vlan']))
+if (!is_array($config['vlans']['vlan'])) {
 	$config['vlans']['vlan'] = array();
+}
 
 $a_vlans = &$config['vlans']['vlan'];
 
@@ -53,14 +54,17 @@ $portlist = get_interface_list();
 
 /* add LAGG interfaces */
 if (is_array($config['laggs']['lagg']) && count($config['laggs']['lagg'])) {
-        foreach ($config['laggs']['lagg'] as $lagg)
-                $portlist[$lagg['laggif']] = $lagg;
+	foreach ($config['laggs']['lagg'] as $lagg) {
+		$portlist[$lagg['laggif']] = $lagg;
+	}
 }
 
-if (is_numericint($_GET['id']))
+if (is_numericint($_GET['id'])) {
 	$id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
+}
+if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
+}
 
 if (isset($id) && $a_vlans[$id]) {
 	$pconfig['if'] = $a_vlans[$id]['if'];
@@ -84,18 +88,21 @@ if ($_POST) {
 		$input_errors[] = gettext("The VLAN tag must be an integer between 1 and 4094.");
 	}
 
-	if (!does_interface_exist($_POST['if']))
+	if (!does_interface_exist($_POST['if'])) {
 		$input_errors[] = gettext("Interface supplied as parent is invalid");
+	}
 
 	if (isset($id)) {
 		if ($_POST['tag'] && $_POST['tag'] != $a_vlans[$id]['tag']) {
-			if (!empty($a_vlans[$id]['vlanif']) && convert_real_interface_to_friendly_interface_name($a_vlans[$id]['vlanif']) != NULL)
+			if (!empty($a_vlans[$id]['vlanif']) && convert_real_interface_to_friendly_interface_name($a_vlans[$id]['vlanif']) != NULL) {
 				$input_errors[] = gettext("Interface is assigned and you cannot change the VLAN tag while assigned.");
+			}
 		}
 	}
 	foreach ($a_vlans as $vlan) {
-		if (isset($id) && ($a_vlans[$id]) && ($a_vlans[$id] === $vlan))
+		if (isset($id) && ($a_vlans[$id]) && ($a_vlans[$id] === $vlan)) {
 			continue;
+		}
 
 		if (($vlan['if'] == $_POST['if']) && ($vlan['tag'] == $_POST['tag'])) {
 			$input_errors[] = sprintf(gettext("A VLAN with the tag %s is already defined on this interface."),$vlan['tag']);
@@ -103,9 +110,11 @@ if ($_POST) {
 		}
 	}
 	if (is_array($config['qinqs']['qinqentry'])) {
-		foreach ($config['qinqs']['qinqentry'] as $qinq)
-			if ($qinq['tag'] == $_POST['tag'] && $qinq['if'] == $_POST['if'])
+		foreach ($config['qinqs']['qinqentry'] as $qinq) {
+			if ($qinq['tag'] == $_POST['tag'] && $qinq['if'] == $_POST['if']) {
 				$input_errors[] = gettext("A QinQ VLAN exists with this tag please remove it to use this tag with.");
+			}
+		}
 	}
 
 	if (!$input_errors) {
@@ -119,8 +128,9 @@ if ($_POST) {
 					pfSense_interface_destroy("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
 					$confif = convert_real_interface_to_friendly_interface_name("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
 				}
-				if ($confif <> "")
+				if ($confif <> "") {
 					$config['interfaces'][$confif]['if'] = "{$_POST['if']}_vlan{$_POST['tag']}";
+				}
 			}
 		}
 		$vlan = array();
@@ -130,19 +140,21 @@ if ($_POST) {
 		$vlan['vlanif'] = "{$_POST['if']}_vlan{$_POST['tag']}";
 
 		$vlan['vlanif'] = interface_vlan_configure($vlan);
-                if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan"))
-                        $input_errors[] = gettext("Error occurred creating interface, please retry.");
-                else {
-                        if (isset($id) && $a_vlans[$id])
-                                $a_vlans[$id] = $vlan;
-                        else
-                                $a_vlans[] = $vlan;
+		if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan")) {
+			$input_errors[] = gettext("Error occurred creating interface, please retry.");
+		} else {
+			if (isset($id) && $a_vlans[$id]) {
+				$a_vlans[$id] = $vlan;
+			} else {
+				$a_vlans[] = $vlan;
+			}
 
-                        write_config();
+			write_config();
 
-			if ($confif <> "")
+			if ($confif <> "") {
 				interface_configure($confif);
-				
+			}
+
 			header("Location: interfaces_vlan.php");
 			exit;
 		}
@@ -158,56 +170,61 @@ include("head.inc");
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <form action="interfaces_vlan_edit.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="interfaces vlan edit">
-				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("VLAN configuration");?></td>
-				</tr>
-				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td>
-                  <td width="78%" class="vtable">
-                    <select name="if" class="formselect">
-                      <?php
-					  foreach ($portlist as $ifn => $ifinfo)
+<form action="interfaces_vlan_edit.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="interfaces vlan edit">
+		<tr>
+			<td colspan="2" valign="top" class="listtopic"><?=gettext("VLAN configuration");?></td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td>
+			<td width="78%" class="vtable">
+				<select name="if" class="formselect">
+				<?php
+					foreach ($portlist as $ifn => $ifinfo) {
 						if (is_jumbo_capable($ifn)) {
 							echo "<option value=\"{$ifn}\"";
-							if ($ifn == $pconfig['if'])
+							if ($ifn == $pconfig['if']) {
 								echo " selected=\"selected\"";
+							}
 							echo ">";
-                      				        echo htmlspecialchars($ifn . " (" . $ifinfo['mac'] . ")");
-                      					echo "</option>";
+							echo htmlspecialchars($ifn . " (" . $ifinfo['mac'] . ")");
+							echo "</option>";
 						}
-		      ?>
-                    </select>
-			<br />
-			<span class="vexpl"><?=gettext("Only VLAN capable interfaces will be shown.");?></span></td>
-                </tr>
-				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("VLAN tag ");?></td>
-                  <td class="vtable">
-                    <input name="tag" type="text" class="formfld unknown" id="tag" size="6" value="<?=htmlspecialchars($pconfig['tag']);?>" />
-                    <br />
-                    <span class="vexpl"><?=gettext("802.1Q VLAN tag (between 1 and 4094) ");?></span></td>
-			    </tr>
-				<tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
-                    "for your reference (not parsed).");?></span></td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
-		    <input type="hidden" name="vlanif" value="<?=htmlspecialchars($pconfig['vlanif']); ?>" />
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-                    <?php if (isset($id) && $a_vlans[$id]): ?>
-                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-                    <?php endif; ?>
-                  </td>
-                </tr>
-              </table>
+					}
+			  ?>
+				</select>
+				<br />
+				<span class="vexpl"><?=gettext("Only VLAN capable interfaces will be shown.");?></span>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("VLAN tag ");?></td>
+			<td class="vtable">
+				<input name="tag" type="text" class="formfld unknown" id="tag" size="6" value="<?=htmlspecialchars($pconfig['tag']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("802.1Q VLAN tag (between 1 and 4094) ");?></span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+			<td width="78%" class="vtable">
+				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed).");?></span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top">&nbsp;</td>
+			<td width="78%">
+				<input type="hidden" name="vlanif" value="<?=htmlspecialchars($pconfig['vlanif']); ?>" />
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
+				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+				<?php if (isset($id) && $a_vlans[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+			</td>
+		</tr>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>