Code style interfaces miscellaneous files

1 files changed, 133 insertions, 104 deletions

diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php
index 294c1ca..74ba136 100644
--- a/usr/local/www/interfaces_gif_edit.php
+++ b/usr/local/www/interfaces_gif_edit.php
@@ -43,15 +43,18 @@ require("guiconfig.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_gif.php');
 
-if (!is_array($config['gifs']['gif']))
+if (!is_array($config['gifs']['gif'])) {
 	$config['gifs']['gif'] = array();
+}
 
 $a_gifs = &$config['gifs']['gif'];
 
-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_gifs[$id]) {
 	$pconfig['if'] = $a_gifs[$id]['if'];
@@ -79,21 +82,24 @@ if ($_POST) {
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-	if ((!is_ipaddr($_POST['tunnel-local-addr'])) || (!is_ipaddr($_POST['tunnel-remote-addr'])) ||
-			(!is_ipaddr($_POST['remote-addr']))) {
+	if ((!is_ipaddr($_POST['tunnel-local-addr'])) ||
+	    (!is_ipaddr($_POST['tunnel-remote-addr'])) ||
+	    (!is_ipaddr($_POST['remote-addr']))) {
 		$input_errors[] = gettext("The tunnel local and tunnel remote fields must have valid IP addresses.");
 	}
 
 	$alias = strstr($_POST['if'],'|');
 	if ((is_ipaddrv4($alias) && !is_ipaddrv4($_POST['remote-addr'])) ||
-			(is_ipaddrv6($alias) && !is_ipaddrv6($_POST['remote-addr'])))
+	    (is_ipaddrv6($alias) && !is_ipaddrv6($_POST['remote-addr']))) {
 		$input_errors[] = gettext("The alias IP address family has to match the family of the remote peer address.");
+	}
 
 	foreach ($a_gifs as $gif) {
-		if (isset($id) && ($a_gifs[$id]) && ($a_gifs[$id] === $gif))
+		if (isset($id) && ($a_gifs[$id]) && ($a_gifs[$id] === $gif)) {
 			continue;
+		}
 
-		/* FIXME: needs to perform proper subnet checks in the feature */
+		/* FIXME: needs to perform proper subnet checks in the future */
 		if (($gif['if'] == $interface) && ($gif['tunnel-remote-addr'] == $_POST['tunnel-remote-addr'])) {
 			$input_errors[] = sprintf(gettext("A gif with the network %s is already defined."), $gif['tunnel-remote-addr']);
 			break;
@@ -112,20 +118,22 @@ if ($_POST) {
 		$gif['link0'] = isset($_POST['link0']);
 		$gif['gifif'] = $_POST['gifif'];
 
-                $gif['gifif'] = interface_gif_configure($gif);
-                if ($gif['gifif'] == "" || !stristr($gif['gifif'], "gif"))
-                        $input_errors[] = gettext("Error occurred creating interface, please retry.");
-                else {
-                        if (isset($id) && $a_gifs[$id])
-                                $a_gifs[$id] = $gif;
-                        else
-                                $a_gifs[] = $gif;
+		$gif['gifif'] = interface_gif_configure($gif);
+		if ($gif['gifif'] == "" || !stristr($gif['gifif'], "gif")) {
+			$input_errors[] = gettext("Error occurred creating interface, please retry.");
+		} else {
+			if (isset($id) && $a_gifs[$id]) {
+				$a_gifs[$id] = $gif;
+			} else {
+				$a_gifs[] = $gif;
+			}
 
-                        write_config();
+			write_config();
 
 			$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
-                        if ($confif <> "")
-                                interface_configure($confif);
+			if ($confif <> "") {
+				interface_configure($confif);
+			}
 
 			header("Location: interfaces_gif.php");
 			exit;
@@ -143,95 +151,116 @@ include("head.inc");
 <script type="text/javascript" src="/javascript/jquery.ipv4v6ify.js"></script>
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <form action="interfaces_gif_edit.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="interfaces gif edit">
-				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("GIF 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
-						$portlist = get_possible_listen_ips();
-						foreach ($portlist as $ifn => $ifinfo) {
-							echo "<option value=\"{$ifn}\"";
-							if ($ifn == $pconfig['if'])
-								echo " selected=\"selected\"";
-							echo ">" . htmlspecialchars($ifinfo) . "</option>\n";
+<form action="interfaces_gif_edit.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="interfaces gif edit">
+		<tr>
+			<td colspan="2" valign="top" class="listtopic"><?=gettext("GIF 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
+					$portlist = get_possible_listen_ips();
+					foreach ($portlist as $ifn => $ifinfo) {
+						echo "<option value=\"{$ifn}\"";
+						if ($ifn == $pconfig['if']) {
+							echo " selected=\"selected\"";
 						}
-		      		?>
-                    </select>
-			<br />
-			<span class="vexpl"><?=gettext("The interface here serves as the local address to be used for the gif tunnel."); ?></span></td>
-                </tr>
-				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("gif remote address"); ?></td>
-                  <td class="vtable">
-                    <input name="remote-addr" type="text" class="formfld unknown" id="remote-addr" size="24" value="<?=htmlspecialchars($pconfig['remote-addr']);?>" />
-                    <br />
-                    <span class="vexpl"><?=gettext("Peer address where encapsulated gif packets will be sent. "); ?></span></td>
-			    </tr>
-				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("gif tunnel local address"); ?></td>
-                  <td class="vtable">
-                    <input name="tunnel-local-addr" type="text" class="formfld unknown" id="tunnel-local-addr" size="24" value="<?=htmlspecialchars($pconfig['tunnel-local-addr']);?>" />
-                    <br />
-                    <span class="vexpl"><?=gettext("Local gif tunnel endpoint"); ?></span></td>
-			    </tr>
-				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("gif tunnel remote address "); ?></td>
-                  <td class="vtable">
-                    <input name="tunnel-remote-addr" type="text" class="formfld unknown ipv4v6" id="tunnel-remote-addr" size="24" value="<?=htmlspecialchars($pconfig['tunnel-remote-addr']);?>" />
-                    <select name="tunnel-remote-net" class="formselect ipv4v6" id="tunnel-remote-net">
-                                        <?php
-                                        for ($i = 128; $i > 0; $i--) {
+						echo ">" . htmlspecialchars($ifinfo) . "</option>\n";
+					}
+				?>
+				</select>
+				<br />
+				<span class="vexpl">
+					<?=gettext("The interface here serves as the local address to be used for the gif tunnel."); ?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("gif remote address"); ?></td>
+			<td class="vtable">
+				<input name="remote-addr" type="text" class="formfld unknown" id="remote-addr" size="24" value="<?=htmlspecialchars($pconfig['remote-addr']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Peer address where encapsulated gif packets will be sent. "); ?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("gif tunnel local address"); ?></td>
+			<td class="vtable">
+				<input name="tunnel-local-addr" type="text" class="formfld unknown" id="tunnel-local-addr" size="24" value="<?=htmlspecialchars($pconfig['tunnel-local-addr']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Local gif tunnel endpoint"); ?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncellreq"><?=gettext("gif tunnel remote address "); ?></td>
+			<td class="vtable">
+				<input name="tunnel-remote-addr" type="text" class="formfld unknown ipv4v6" id="tunnel-remote-addr" size="24" value="<?=htmlspecialchars($pconfig['tunnel-remote-addr']);?>" />
+				<select name="tunnel-remote-net" class="formselect ipv4v6" id="tunnel-remote-net">
+				<?php
+					for ($i = 128; $i > 0; $i--) {
 						echo "<option value=\"{$i}\"";
-						if ($i == $pconfig['tunnel-remote-net'])
+						if ($i == $pconfig['tunnel-remote-net']) {
 							echo " selected=\"selected\"";
+						}
 						echo ">" . $i . "</option>";
-                                        }
-                                        ?>
-                    </select>
-                    <br />
-                    <span class="vexpl"><?=gettext("Remote gif address endpoint. The subnet part is used for determining the network that is tunnelled."); ?></span></td>
-			    </tr>
-				<tr>
-                  <td valign="top" class="vncell"><?=gettext("Route caching  "); ?></td>
-                  <td class="vtable">
-                    <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked=\"checked\"";?> />
-                    <br />
-                    <span class="vexpl"><?=gettext("Specify if route caching can be enabled. Be careful with these settings on dynamic networks. "); ?></span></td>
-			    </tr>
-				<tr>
-                  <td valign="top" class="vncell"><?=gettext("ECN friendly behavior"); ?></td>
-                  <td class="vtable">
-                    <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked=\"checked\"";?> />
-                    <br />
-                    <span class="vexpl">
-     <?=gettext("Note that the ECN friendly behavior violates RFC2893.  This should be " .
-     "used in mutual agreement with the peer."); ?>					
-					 </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="gifif" value="<?=htmlspecialchars($pconfig['gifif']); ?>" />
-                    <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_gifs[$id]): ?>
-                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-                    <?php endif; ?>
-                  </td>
-                </tr>
-              </table>
+					}
+				?>
+				</select>
+				<br />
+				<span class="vexpl">
+					<?=gettext("Remote gif address endpoint. The subnet part is used for determining the network that is tunnelled."); ?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncell"><?=gettext("Route caching  "); ?></td>
+			<td class="vtable">
+				<input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked=\"checked\"";?> />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Specify if route caching can be enabled. Be careful with these settings on dynamic networks. "); ?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="vncell"><?=gettext("ECN friendly behavior"); ?></td>
+			<td class="vtable">
+				<input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked=\"checked\"";?> />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Note that the ECN friendly behavior violates RFC2893.  This should be " .
+					"used in mutual agreement with the peer."); ?>
+				</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="gifif" value="<?=htmlspecialchars($pconfig['gifif']); ?>" />
+				<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_gifs[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+			</td>
+		</tr>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>