Code style vpn_pppoe

1 files changed, 76 insertions, 66 deletions

diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php
index b523c33..082978a 100644
--- a/usr/local/www/vpn_pppoe.php
+++ b/usr/local/www/vpn_pppoe.php
@@ -41,20 +41,22 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("vpn.inc");
 
-if (!is_array($config['pppoes']['pppoe']))
+if (!is_array($config['pppoes']['pppoe'])) {
 	$config['pppoes']['pppoe'] = array();
+}
 
 $a_pppoes = &$config['pppoes']['pppoe'];
 
 if ($_POST) {
-        $pconfig = $_POST;
+	$pconfig = $_POST;
 
-        if ($_POST['apply']) {
-                if (file_exists("{$g['tmp_path']}/.vpn_pppoe.apply")) {
-                        $toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.vpn_pppoe.apply"));
-                        foreach ($toapplylist as $pppoeid) {
-				if (!is_numeric($pppoeid))
+	if ($_POST['apply']) {
+		if (file_exists("{$g['tmp_path']}/.vpn_pppoe.apply")) {
+			$toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.vpn_pppoe.apply"));
+			foreach ($toapplylist as $pppoeid) {
+				if (!is_numeric($pppoeid)) {
 					continue;
+				}
 				if (is_array($config['pppoes']['pppoe'])) {
 					foreach ($config['pppoes']['pppoe'] as $pppoe) {
 						if ($pppoe['pppoeid'] == $pppoeid) {
@@ -63,22 +65,24 @@ if ($_POST) {
 						}
 					}
 				}
-                        }
-                        @unlink("{$g['tmp_path']}/.vpn_pppoe.apply");
-                }
-                $retval = 0;
-                $retval |= filter_configure();
-                $savemsg = get_std_save_message($retval);
-                clear_subsystem_dirty('vpnpppoe');
-        }
+			}
+			@unlink("{$g['tmp_path']}/.vpn_pppoe.apply");
+		}
+		$retval = 0;
+		$retval |= filter_configure();
+		$savemsg = get_std_save_message($retval);
+		clear_subsystem_dirty('vpnpppoe');
+	}
 }
 
 if ($_GET['act'] == "del") {
 	if ($a_pppoes[$_GET['id']]) {
-		if ("{$g['varrun_path']}/pppoe" . $a_pppoes[$_GET['id']]['pppoeid'] . "-vpn.pid")
+		if ("{$g['varrun_path']}/pppoe" . $a_pppoes[$_GET['id']]['pppoeid'] . "-vpn.pid") {
 			killbypid("{$g['varrun_path']}/pppoe" . $a_pppoes[$_GET['id']]['pppoeid'] . "-vpn.pid");
-		if (is_dir("{$g['varetc_path']}/pppoe" . $a_pppoes[$_GET['id']]['pppoeid']))
+		}
+		if (is_dir("{$g['varetc_path']}/pppoe" . $a_pppoes[$_GET['id']]['pppoeid'])) {
 			mwexec("/bin/rm -r {$g['varetc_path']}/pppoe" . $a_pppoes[$_GET['id']]['pppoeid']);
+		}
 		unset($a_pppoes[$_GET['id']]);
 		write_config();
 		header("Location: vpn_pppoe.php");
@@ -101,55 +105,61 @@ include("head.inc");
 <?php endif; ?>
 
 <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-  <td width="15%" class="listhdrr"><?=gettext("Interface");?></td>
-  <td width="10%" class="listhdrr"><?=gettext("Local IP");?></td>
-  <td width="25%" class="listhdrr"><?=gettext("Number of users");?></td>
-  <td width="25%" class="listhdr"><?=gettext("Description");?></td>
-  <td width="5%" class="list">
-    <table border="0" cellspacing="0" cellpadding="1" summary="pppoe server">
-      <tr>
-	<td valign="middle" width="17">&nbsp;</td>
-        <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt="add" /></a></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-	  <?php $i = 0; foreach ($a_pppoes as $pppoe): ?>
-<tr>
-  <td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
-    <?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($pppoe['interface']));?>
-  </td>
-  <td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
-    <?=htmlspecialchars($pppoe['localip']);?>
-  </td>
-  <td class="listr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
-      <?=htmlspecialchars($pppoe['n_pppoe_units']);?>
-  </td>
-  <td class="listbg" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
-    <?=htmlspecialchars($pppoe['descr']);?>&nbsp;
-  </td>
-  <td valign="middle" class="list nowrap">
-    <table border="0" cellspacing="0" cellpadding="1" summary="icons">
-      <tr>
-        <td valign="middle"><a href="vpn_pppoe_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit PPPoE instance"); ?>" alt="edit" /></a></td>
-        <td><a href="vpn_pppoe.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete pppoe instance");?>" alt="delete" /></a></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-	  <?php $i++; endforeach; ?>
-<tr>
-  <td class="list" colspan="4"></td>
-  <td class="list">
-    <table border="0" cellspacing="0" cellpadding="1" summary="add">
-      <tr>
-	<td valign="middle" width="17">&nbsp;</td>
-        <td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt="add" /></a></td>
-      </tr>
-    </table>
-  </td>
-</tr>
+	<tr>
+		<td width="15%" class="listhdrr"><?=gettext("Interface");?></td>
+		<td width="10%" class="listhdrr"><?=gettext("Local IP");?></td>
+		<td width="25%" class="listhdrr"><?=gettext("Number of users");?></td>
+		<td width="25%" class="listhdr"><?=gettext("Description");?></td>
+		<td width="5%" class="list">
+			<table border="0" cellspacing="0" cellpadding="1" summary="pppoe server">
+				<tr>
+					<td valign="middle" width="17">&nbsp;</td>
+					<td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt="add" /></a></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+<?php
+	$i = 0;
+	foreach ($a_pppoes as $pppoe):
+?>
+	<tr>
+		<td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
+			<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($pppoe['interface']));?>
+		</td>
+		<td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
+			<?=htmlspecialchars($pppoe['localip']);?>
+		</td>
+		<td class="listr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
+			<?=htmlspecialchars($pppoe['n_pppoe_units']);?>
+		</td>
+		<td class="listbg" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
+			<?=htmlspecialchars($pppoe['descr']);?>&nbsp;
+		</td>
+		<td valign="middle" class="list nowrap">
+			<table border="0" cellspacing="0" cellpadding="1" summary="icons">
+				<tr>
+					<td valign="middle"><a href="vpn_pppoe_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit PPPoE instance"); ?>" alt="edit" /></a></td>
+					<td><a href="vpn_pppoe.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete pppoe instance");?>" alt="delete" /></a></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+<?php
+		$i++;
+	endforeach;
+?>
+	<tr>
+		<td class="list" colspan="4"></td>
+		<td class="list">
+			<table border="0" cellspacing="0" cellpadding="1" summary="add">
+				<tr>
+					<td valign="middle" width="17">&nbsp;</td>
+					<td valign="middle"><a href="vpn_pppoe_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new pppoe instance");?>" alt="add" /></a></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
 </table>
 </form>
 <?php include("fend.inc"); ?>