Code style www services captive portal

1 files changed, 69 insertions, 53 deletions

diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php
index 4ad066a..c5e5544 100644
--- a/usr/local/www/services_captiveportal_ip_edit.php
+++ b/usr/local/www/services_captiveportal_ip_edit.php
@@ -1,24 +1,24 @@
-<?php 
+<?php
 /*
 	services_captiveportal_ip_edit.php
 	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
 	Copyright (C) 2011 Scott Ullrich <sullrich@gmail.com>
 	All rights reserved.
 
-	Originally part of m0n0wall (http://m0n0.ch/wall)	
+	Originally part of m0n0wall (http://m0n0.ch/wall)
 	Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com>
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
-	
+
 	1. Redistributions of source code must retain the above copyright notice,
 	   this list of conditions and the following disclaimer.
-	
+
 	2. Redistributions in binary form must reproduce the above copyright
 	   notice, this list of conditions and the following disclaimer in the
 	   documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -49,7 +49,7 @@ function allowedipscmp($a, $b) {
 function allowedips_sort() {
 	global $g, $config, $cpzone;
 
-	usort($config['captiveportal'][$cpzone]['allowedip'],"allowedipscmp");
+	usort($config['captiveportal'][$cpzone]['allowedip'], "allowedipscmp");
 }
 
 require("guiconfig.inc");
@@ -58,29 +58,34 @@ require_once("filter.inc");
 require("shaper.inc");
 require("captiveportal.inc");
 
-$pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit allowed IP address"));
+$pgtitle = array(gettext("Services"), gettext("Captive portal"), gettext("Edit allowed IP address"));
 $shortcut_section = "captiveportal";
 
 $cpzone = $_GET['zone'];
-if (isset($_POST['zone']))
-        $cpzone = $_POST['zone'];
-                        
+if (isset($_POST['zone'])) {
+	$cpzone = $_POST['zone'];
+}
+
 if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) {
-        header("Location: services_captiveportal_zones.php");
-        exit;
+	header("Location: services_captiveportal_zones.php");
+	exit;
 }
 
-if (!is_array($config['captiveportal']))
-        $config['captiveportal'] = array();
+if (!is_array($config['captiveportal'])) {
+	$config['captiveportal'] = array();
+}
 $a_cp =& $config['captiveportal'];
 
-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 (!is_array($config['captiveportal'][$cpzone]['allowedip']))
+if (!is_array($config['captiveportal'][$cpzone]['allowedip'])) {
 	$config['captiveportal'][$cpzone]['allowedip'] = array();
+}
 $a_allowedips =& $config['captiveportal'][$cpzone]['allowedip'];
 
 if (isset($id) && $a_allowedips[$id]) {
@@ -99,29 +104,34 @@ if ($_POST) {
 	/* input validation */
 	$reqdfields = explode(" ", "ip sn");
 	$reqdfieldsn = array(gettext("Allowed IP address"), gettext("Subnet mask"));
-	
+
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-	
-	if ($_POST['ip'] && !is_ipaddr($_POST['ip']))
+
+	if ($_POST['ip'] && !is_ipaddr($_POST['ip'])) {
 		$input_errors[] = sprintf(gettext("A valid IP address must be specified. [%s]"), $_POST['ip']);
-	
-	if ($_POST['sn'] && (!is_numeric($_POST['sn']) || ($_POST['sn'] < 1) || ($_POST['sn'] > 32)))
+	}
+
+	if ($_POST['sn'] && (!is_numeric($_POST['sn']) || ($_POST['sn'] < 1) || ($_POST['sn'] > 32))) {
 		$input_errors[] = gettext("A valid subnet mask must be specified");
-	
-	if ($_POST['bw_up'] && !is_numeric($_POST['bw_up']))
+	}
+
+	if ($_POST['bw_up'] && !is_numeric($_POST['bw_up'])) {
 		$input_errors[] = gettext("Upload speed needs to be an integer");
+	}
 
-	if ($_POST['bw_down'] && !is_numeric($_POST['bw_down']))
+	if ($_POST['bw_down'] && !is_numeric($_POST['bw_down'])) {
 		$input_errors[] = gettext("Download speed needs to be an integer");
+	}
 
 	foreach ($a_allowedips as $ipent) {
-		if (isset($id) && ($a_allowedips[$id]) && ($a_allowedips[$id] === $ipent))
+		if (isset($id) && ($a_allowedips[$id]) && ($a_allowedips[$id] === $ipent)) {
 			continue;
-		
-		if ($ipent['ip'] == $_POST['ip']){
+		}
+
+		if ($ipent['ip'] == $_POST['ip']) {
 			$input_errors[] = sprintf("[%s] %s.", $_POST['ip'], gettext("already allowed")) ;
 			break ;
-		}	
+		}
 	}
 
 	if (!$input_errors) {
@@ -129,16 +139,19 @@ if ($_POST) {
 		$ip['ip'] = $_POST['ip'];
 		$ip['sn'] = $_POST['sn'];
 		$ip['descr'] = $_POST['descr'];
-		if ($_POST['bw_up'])
+		if ($_POST['bw_up']) {
 			$ip['bw_up'] = $_POST['bw_up'];
-		if ($_POST['bw_down'])
+		}
+		if ($_POST['bw_down']) {
 			$ip['bw_down'] = $_POST['bw_down'];
+		}
 		if (isset($id) && $a_allowedips[$id]) {
 			$oldip = $a_allowedips[$id]['ip'];
-			if (!empty($a_allowedips[$id]['sn']))
+			if (!empty($a_allowedips[$id]['sn'])) {
 				$oldmask = $a_allowedips[$id]['sn'];
-			else
+			} else {
 				$oldmask = 32;
+			}
 			$a_allowedips[$id] = $ip;
 		} else {
 			$a_allowedips[] = $ip;
@@ -169,7 +182,7 @@ if ($_POST) {
 			mwexec("/sbin/ipfw -x {$cpzoneid} -q {$g['tmp_path']}/{$uniqid}_tmp");
 			@unlink("{$g['tmp_path']}/{$uniqid}_tmp");
 		}
-		
+
 		header("Location: services_captiveportal_ip.php?zone={$cpzone}");
 		exit;
 	}
@@ -181,48 +194,51 @@ 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="services_captiveportal_ip_edit.php" method="post" name="iform" id="iform">
-		<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="captiveportal allow ip edit">
+<form action="services_captiveportal_ip_edit.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="captiveportal allow ip edit">
 		<tr>
-                        <td colspan="2" valign="top" class="listtopic"><?=gettext("Edit allowed ip rule");?></td>
-                </tr>
+			<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit allowed ip rule");?></td>
+		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("IP address"); ?></td>
-			<td width="78%" class="vtable"> 
+			<td width="78%" class="vtable">
 				<?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="17" value="<?=htmlspecialchars($pconfig['ip']);?>" />
 				/<select name='sn' class="formselect" id='sn'>
 				<?php for ($i = 32; $i >= 1; $i--): ?>
 					<option value="<?=$i;?>" <?php if ($i == $pconfig['sn']) echo "selected=\"selected\""; ?>><?=$i;?></option>
 				<?php endfor; ?>
 				</select>
-				<br /> 
+				<br />
 				<span class="vexpl"><?=gettext("IP address and subnet mask. Use /32 for a single IP");?>.</span>
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
-			<td width="78%" class="vtable"> 
+			<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>
+				<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" class="vncell"><?=gettext("Bandwidth up"); ?></td>
 			<td width="78%" class="vtable">
-			<input name="bw_up" type="text" class="formfld unknown" id="bw_up" size="10" value="<?=htmlspecialchars($pconfig['bw_up']);?>" />
-			<br /> <span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this IP address in Kbit/s"); ?></span>
-		</td>
+				<input name="bw_up" type="text" class="formfld unknown" id="bw_up" size="10" value="<?=htmlspecialchars($pconfig['bw_up']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this IP address in Kbit/s"); ?></span>
+			</td>
 		</tr>
 		<tr>
-		 <td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth down"); ?></td>
-		 <td width="78%" class="vtable">
-			<input name="bw_down" type="text" class="formfld unknown" id="bw_down" size="10" value="<?=htmlspecialchars($pconfig['bw_down']);?>" />
-			<br /> <span class="vexpl"><?=gettext("Enter a download limit to be enforced on this IP address in Kbit/s"); ?></span>
-		</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth down"); ?></td>
+			<td width="78%" class="vtable">
+				<input name="bw_down" type="text" class="formfld unknown" id="bw_down" size="10" value="<?=htmlspecialchars($pconfig['bw_down']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("Enter a download limit to be enforced on this IP address in Kbit/s"); ?></span>
+			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%"> 
+			<td width="78%">
 				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
 				<input name="zone" type="hidden" value="<?=htmlspecialchars($cpzone);?>" />
 				<?php if (isset($id) && $a_allowedips[$id]): ?>
@@ -230,7 +246,7 @@ include("head.inc");
 				<?php endif; ?>
 			</td>
 		</tr>
-	  </table>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>