Code style www services captive portal

1 files changed, 135 insertions, 126 deletions

diff --git a/usr/local/www/services_captiveportal_vouchers_edit.php b/usr/local/www/services_captiveportal_vouchers_edit.php
index b43a0f7..5b1afbe 100644
--- a/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -1,21 +1,21 @@
-<?php 
+<?php
 /*
 	services_captiveportal_vouchers_edit.php
 
 	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
 	Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>.
-	All rights reserved. 
-	
+	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
@@ -27,7 +27,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-/*	
+/*
 	pfSense_MODULE:	captiveportal
 */
 
@@ -49,20 +49,22 @@ $pgtitle = array(gettext("Services"), gettext("Captive portal"), gettext("Edit V
 $shortcut_section = "captiveportal-vouchers";
 
 $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_array($config['voucher'])) {
-    $config['voucher'] = array();
+	$config['voucher'] = array();
 }
 
 if (!is_array($config['voucher'][$cpzone]['roll'])) {
@@ -70,10 +72,12 @@ if (!is_array($config['voucher'][$cpzone]['roll'])) {
 }
 $a_roll = &$config['voucher'][$cpzone]['roll'];
 
-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_roll[$id]) {
 	$pconfig['zone'] = $a_roll[$id]['zone'];
@@ -87,81 +91,86 @@ $maxnumber = (1<<$config['voucher'][$cpzone]['rollbits']) -1;    // Highest Roll
 $maxcount = (1<<$config['voucher'][$cpzone]['ticketbits']) -1;   // Highest Ticket#
 
 if ($_POST) {
-	
+
 	unset($input_errors);
 	$pconfig = $_POST;
 
-    /* input validation */
-    $reqdfields = explode(" ", "number count minutes");
-    $reqdfieldsn = array(gettext("Number"),gettext("Count"),gettext("minutes"));
+	/* input validation */
+	$reqdfields = explode(" ", "number count minutes");
+	$reqdfieldsn = array(gettext("Number"), gettext("Count"), gettext("minutes"));
 
-    do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	// Look for duplicate roll #
-	foreach($a_roll as $re) {
-		if($re['number'] == $_POST['number']) {
+	foreach ($a_roll as $re) {
+		if ($re['number'] == $_POST['number']) {
 			$input_errors[] = sprintf(gettext("Roll number %s already exists."), $_POST['number']);
 			break;
 		}
 	}
-	
-    if (!is_numeric($_POST['number']) || $_POST['number'] >= $maxnumber) 
-        $input_errors[] = sprintf(gettext("Roll number must be numeric and less than %s"), $maxnumber);
-
-    if (!is_numeric($_POST['count']) || $_POST['count'] < 1 || $_POST['count'] > $maxcount)
-        $input_errors[] = sprintf(gettext("A roll has at least one voucher and less than %s."), $maxcount);
-
-    if (!is_numeric($_POST['minutes']) || $_POST['minutes'] < 1)
-        $input_errors[] = gettext("Each voucher must be good for at least 1 minute.");
-
-    if (!$input_errors) {
-
-        if (isset($id) && $a_roll[$id])
-            $rollent = $a_roll[$id];
-
-        $rollent['zone']  = $_POST['zone'];
-        $rollent['number']  = $_POST['number'];
-        $rollent['minutes'] = $_POST['minutes'];
-        $rollent['descr'] = $_POST['descr'];
-
-        /* New Roll or modified voucher count: create bitmask */
-	$voucherlck = lock("voucher{$cpzone}");
-        if ($_POST['count'] != $rollent['count']) {
-            $rollent['count'] = $_POST['count'];
-            $len = ($rollent['count']>>3) + 1;   // count / 8 +1
-            $rollent['used'] = base64_encode(str_repeat("\000",$len)); // 4 bitmask
-            $rollent['active'] = array();
-            voucher_write_used_db($rollent['number'], $rollent['used']);
-            voucher_write_active_db($rollent['number'], array());   // create empty DB
-            voucher_log(LOG_INFO,sprintf(gettext('All %1$s vouchers from Roll %2$s marked unused'), $rollent['count'], $rollent['number']));
-        } else {
-            // existing roll has been modified but without changing the count
-            // read active and used DB from ramdisk and store it in XML config
-            $rollent['used'] = base64_encode(voucher_read_used_db($rollent['number']));
-            $activent = array();
-            $db = array();
-            $active_vouchers = voucher_read_active_db($rollent['number'], $rollent['minutes']);
-            foreach($active_vouchers as $voucher => $line) {
-                list($timestamp, $minutes) = explode(",", $line);
-                $activent['voucher'] = $voucher;
-                $activent['timestamp'] = $timestamp;
-                $activent['minutes'] = $minutes;
-                $db[] = $activent;
-            }
-            $rollent['active'] = $db;
-        }
-	unlock($voucherlck);
-
-        if (isset($id) && $a_roll[$id])
-            $a_roll[$id] = $rollent;
-        else
-            $a_roll[] = $rollent;
-
-        write_config();
-
-        header("Location: services_captiveportal_vouchers.php?zone={$cpzone}");
-        exit;
-    }
+
+	if (!is_numeric($_POST['number']) || $_POST['number'] >= $maxnumber) {
+		$input_errors[] = sprintf(gettext("Roll number must be numeric and less than %s"), $maxnumber);
+	}
+
+	if (!is_numeric($_POST['count']) || $_POST['count'] < 1 || $_POST['count'] > $maxcount) {
+		$input_errors[] = sprintf(gettext("A roll has at least one voucher and less than %s."), $maxcount);
+	}
+
+	if (!is_numeric($_POST['minutes']) || $_POST['minutes'] < 1) {
+		$input_errors[] = gettext("Each voucher must be good for at least 1 minute.");
+	}
+
+	if (!$input_errors) {
+
+		if (isset($id) && $a_roll[$id]) {
+			$rollent = $a_roll[$id];
+		}
+
+		$rollent['zone']  = $_POST['zone'];
+		$rollent['number']  = $_POST['number'];
+		$rollent['minutes'] = $_POST['minutes'];
+		$rollent['descr'] = $_POST['descr'];
+
+		/* New Roll or modified voucher count: create bitmask */
+		$voucherlck = lock("voucher{$cpzone}");
+		if ($_POST['count'] != $rollent['count']) {
+			$rollent['count'] = $_POST['count'];
+			$len = ($rollent['count']>>3) + 1;   // count / 8 +1
+			$rollent['used'] = base64_encode(str_repeat("\000", $len)); // 4 bitmask
+			$rollent['active'] = array();
+			voucher_write_used_db($rollent['number'], $rollent['used']);
+			voucher_write_active_db($rollent['number'], array());   // create empty DB
+			voucher_log(LOG_INFO, sprintf(gettext('All %1$s vouchers from Roll %2$s marked unused'), $rollent['count'], $rollent['number']));
+		} else {
+			// existing roll has been modified but without changing the count
+			// read active and used DB from ramdisk and store it in XML config
+			$rollent['used'] = base64_encode(voucher_read_used_db($rollent['number']));
+			$activent = array();
+			$db = array();
+			$active_vouchers = voucher_read_active_db($rollent['number'], $rollent['minutes']);
+			foreach ($active_vouchers as $voucher => $line) {
+				list($timestamp, $minutes) = explode(",", $line);
+				$activent['voucher'] = $voucher;
+				$activent['timestamp'] = $timestamp;
+				$activent['minutes'] = $minutes;
+				$db[] = $activent;
+			}
+			$rollent['active'] = $db;
+		}
+		unlock($voucherlck);
+
+		if (isset($id) && $a_roll[$id]) {
+			$a_roll[$id] = $rollent;
+		} else {
+			$a_roll[] = $rollent;
+		}
+
+		write_config();
+
+		header("Location: services_captiveportal_vouchers.php?zone={$cpzone}");
+		exit;
+	}
 }
 
 include("head.inc");
@@ -171,51 +180,51 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <form action="services_captiveportal_vouchers_edit.php" method="post" name="iform" id="iform">
-  <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="content pane">
-	<tr> 
-	  <td width="22%" valign="top" class="vncellreq"><?=gettext("Roll"); ?>#</td>
-	  <td width="78%" class="vtable"> 
-		<?=$mandfldhtml;?><input name="number" type="text" class="formfld" id="number" size="10" value="<?=htmlspecialchars($pconfig['number']);?>" /> 
-        <br />
-        <span class="vexpl"><?=gettext("Enter the Roll"); ?># (0..<?=htmlspecialchars($maxnumber);?>) <?=gettext("found on top of the generated/printed vouchers"); ?>.</span>
-		</td>
-	</tr>
-	<tr> 
-	  <td width="22%" valign="top" class="vncellreq"><?=gettext("Minutes per Ticket"); ?></td>
-	  <td width="78%" class="vtable"> 
-		<?=$mandfldhtml;?><input name="minutes" type="text" class="formfld" id="minutes" size="10" value="<?=htmlspecialchars($pconfig['minutes']);?>" /> 
-        <br />
-        <span class="vexpl"><?=gettext("Defines the time in minutes that a user is allowed access. The clock starts ticking the first time a voucher is used for authentication"); ?>.</span>
-	   </td>
-	</tr>
-	<tr> 
-	  <td width="22%" valign="top" class="vncellreq"><?=gettext("Count"); ?></td>
-	  <td width="78%" class="vtable"> 
-		<?=$mandfldhtml;?><input name="count" type="text" class="formfld" id="count" size="10" value="<?=htmlspecialchars($pconfig['count']);?>" /> 
-        <br />
-        <span class="vexpl"><?=gettext("Enter the number of vouchers"); ?> (1..<?=htmlspecialchars($maxcount);?>) <?=gettext("found on top of the generated/printed vouchers. WARNING: Changing this number for an existing Roll will mark all vouchers as unused again"); ?>.</span>
-		</td>
-	</tr>
-	<tr> 
-	  <td width="22%" valign="top" class="vncell"><?=gettext("Comment"); ?></td>
-	  <td width="78%" class="vtable"> 
-		<?=$mandfldhtml;?><input name="descr" type="text" class="formfld" id="descr" size="60" value="<?=htmlspecialchars($pconfig['descr']);?>" /> 
-        <br />
-        <span class="vexpl"><?=gettext("Can be used to further identify this roll. Ignored by the system"); ?>.</span>
-		</td>
-	</tr>
-	<tr> 
-	  <td width="22%" valign="top">&nbsp;</td>
-	  <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_roll[$id]): ?>
-		<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-		<?php endif; ?>
-	  </td>
-	</tr>
-  </table>
- </form>
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="content pane">
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Roll"); ?>#</td>
+			<td width="78%" class="vtable">
+				<?=$mandfldhtml;?><input name="number" type="text" class="formfld" id="number" size="10" value="<?=htmlspecialchars($pconfig['number']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("Enter the Roll"); ?># (0..<?=htmlspecialchars($maxnumber);?>) <?=gettext("found on top of the generated/printed vouchers"); ?>.</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Minutes per Ticket"); ?></td>
+			<td width="78%" class="vtable">
+				<?=$mandfldhtml;?><input name="minutes" type="text" class="formfld" id="minutes" size="10" value="<?=htmlspecialchars($pconfig['minutes']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("Defines the time in minutes that a user is allowed access. The clock starts ticking the first time a voucher is used for authentication"); ?>.</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Count"); ?></td>
+			<td width="78%" class="vtable">
+				<?=$mandfldhtml;?><input name="count" type="text" class="formfld" id="count" size="10" value="<?=htmlspecialchars($pconfig['count']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("Enter the number of vouchers"); ?> (1..<?=htmlspecialchars($maxcount);?>) <?=gettext("found on top of the generated/printed vouchers. WARNING: Changing this number for an existing Roll will mark all vouchers as unused again"); ?>.</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Comment"); ?></td>
+			<td width="78%" class="vtable">
+				<?=$mandfldhtml;?><input name="descr" type="text" class="formfld" id="descr" size="60" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("Can be used to further identify this roll. Ignored by the system"); ?>.</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top">&nbsp;</td>
+			<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_roll[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+			</td>
+		</tr>
+	</table>
+</form>
 <?php include("fend.inc"); ?>
 </body>
 </html>