Code style interfaces miscellaneous files

1 files changed, 52 insertions, 43 deletions

diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php
index 2b6e987..29313d6 100644
--- a/usr/local/www/interfaces_gre.php
+++ b/usr/local/www/interfaces_gre.php
@@ -43,8 +43,9 @@
 require("guiconfig.inc");
 require_once("functions.inc");
 
-if (!is_array($config['gres']['gre']))
+if (!is_array($config['gres']['gre'])) {
 	$config['gres']['gre'] = array();
+}
 
 $a_gres = &$config['gres']['gre'] ;
 
@@ -53,20 +54,21 @@ function gre_inuse($num) {
 
 	$iflist = get_configured_interface_list(false, true);
 	foreach ($iflist as $if) {
-		if ($config['interfaces'][$if]['if'] == $a_gres[$num]['greif']) 
+		if ($config['interfaces'][$if]['if'] == $a_gres[$num]['greif']) {
 			return true;
+		}
 	}
 
 	return false;
 }
 
 if ($_GET['act'] == "del") {
-	if (!isset($_GET['id']))
-                $input_errors[] = gettext("Wrong parameters supplied");
-        else if (empty($a_gres[$_GET['id']]))
-                $input_errors[] = gettext("Wrong index supplied");
+	if (!isset($_GET['id'])) {
+		$input_errors[] = gettext("Wrong parameters supplied");
+	} else if (empty($a_gres[$_GET['id']])) {
+		$input_errors[] = gettext("Wrong index supplied");
 	/* check if still in use */
-	else if (gre_inuse($_GET['id'])) {
+	} else if (gre_inuse($_GET['id'])) {
 		$input_errors[] = gettext("This GRE tunnel cannot be deleted because it is still being used as an interface.");
 	} else {
 		mwexec("/sbin/ifconfig " . $a_gres[$_GET['id']]['greif'] . " destroy");
@@ -89,7 +91,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 gre">
-  <tr><td>
+	<tr><td>
 <?php
 	$tab_array = array();
 	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
@@ -104,44 +106,51 @@ 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("Tunnel to...");?></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("Tunnel to...");?></td>
+					<td width="50%" class="listhdr"><?=gettext("Description");?></td>
+					<td width="10%" class="list"></td>
+				</tr>
+		<?php
+			$i = 0;
+			foreach ($a_gres as $gre):
+		?>
+				<tr  ondblclick="document.location='interfaces_gre_edit.php?id=<?=$i;?>'">
+					<td class="listlr">
+						<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']));?>
+					</td>
+					<td class="listr">
+						<?=htmlspecialchars($gre['remote-addr']);?>
+					</td>
+					<td class="listbg">
+						<?=htmlspecialchars($gre['descr']);?>&nbsp;
+					</td>
+					<td valign="middle" class="list nowrap"> <a href="interfaces_gre_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_gre.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this GRE tunnel?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a>
+					</td>
 				</tr>
-			  <?php $i = 0; foreach ($a_gres as $gre): ?>
-                <tr  ondblclick="document.location='interfaces_gre_edit.php?id=<?=$i;?>'">
-                  <td class="listlr">
-					<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']));?>
-                  </td>
-                  <td class="listr">
-					<?=htmlspecialchars($gre['remote-addr']);?>
-                  </td>
-                  <td class="listbg">
-                    <?=htmlspecialchars($gre['descr']);?>&nbsp;
-                  </td>
-                  <td valign="middle" class="list nowrap"> <a href="interfaces_gre_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_gre.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this GRE tunnel?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+		<?php
+				$i++;
+			endforeach;
+		?>
+				<tr>
+					<td class="list" colspan="3">&nbsp;</td>
+					<td class="list"> <a href="interfaces_gre_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
 				</tr>
-			  <?php $i++; endforeach; ?>
-                <tr>
-                  <td class="list" colspan="3">&nbsp;</td>
-                  <td class="list"> <a href="interfaces_gre_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+				<tr>
+					<td class="tabcont" colspan="3">
+						<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br /></strong></span><?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?></span></p>
+					</td>
 				</tr>
-        <tr>
-                <td class="tabcont" colspan="3">
-                    <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br /></strong></span><?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?></span></p>
-                    </td>
-                </tr>
-              </table>
-	      </div>
-	</td>
+			</table>
+			</div>
+		</td>
 	</tr>
 </table>
 <?php include("fend.inc"); ?>