Code Style sbin tmp usr

Bits and pieces from sbin tmp and usr but not yet usr/local/www

3 files changed, 59 insertions, 52 deletions

diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php
index 19b35d7..357537f 100644
--- a/usr/local/captiveportal/index.php
+++ b/usr/local/captiveportal/index.php
@@ -83,12 +83,13 @@ if ($orig_host != $ourhostname) {
 	return;
 }
 
-if (!empty($cpcfg['redirurl']))
+if (!empty($cpcfg['redirurl'])) {
 	$redirurl = $cpcfg['redirurl'];
-else if (preg_match("/redirurl=(.*)/", $orig_request, $matches))
+} else if (preg_match("/redirurl=(.*)/", $orig_request, $matches)) {
 	$redirurl = urldecode($matches[1]);
-else if ($_REQUEST['redirurl'])
+} else if ($_REQUEST['redirurl']) {
 	$redirurl = $_REQUEST['redirurl'];
+}
 
 $macfilter = !isset($cpcfg['nomacfilter']);
 $passthrumac = isset($cpcfg['passthrumacadd']);
@@ -111,14 +112,16 @@ if ($macfilter || $passthrumac) {
 /* find out if we need RADIUS + RADIUSMAC or not */
 if (file_exists("{$g['vardb_path']}/captiveportal_radius_{$cpzone}.db")) {
 	$radius_enable = TRUE;
-	if (isset($cpcfg['radmac_enable']))
+	if (isset($cpcfg['radmac_enable'])) {
 		$radmac_enable = TRUE;
+	}
 }
 
 /* find radius context */
 $radiusctx = 'first';
-if ($_POST['auth_user2'])
+if ($_POST['auth_user2']) {
 	$radiusctx = 'second';
+}
 
 if ($_POST['logout_id']) {
 	echo <<<EOD
@@ -141,10 +144,11 @@ EOD;
 
 } else if ($macfilter && $clientmac && captiveportal_blocked_mac($clientmac)) {
 	captiveportal_logportalauth($clientmac,$clientmac,$clientip,"Blocked MAC address");
-	if (!empty($cpcfg['blockedmacsurl']))
+	if (!empty($cpcfg['blockedmacsurl'])) {
 		portal_reply_page($cpcfg['blockedmacsurl'], "redir");
-	else
+	} else {
 		portal_reply_page($redirurl, "error", "This MAC address has been blocked");
+	}
 
 } else if ($clientmac && $radmac_enable && portal_mac_radius($clientmac,$clientip, $radiusctx)) {
 	/* radius functions handle everything so we exit here since we're done */
@@ -203,12 +207,13 @@ EOD;
 			portal_reply_page($redirurl, $type, $auth_list['reply_message'] ? $auth_list['reply_message'] : $errormsg);
 		}
 	} else {
-		if (!empty($_POST['auth_user']))
+		if (!empty($_POST['auth_user'])) {
 			$user = $_POST['auth_user'];
-		else if (!empty($_POST['auth_user2']))
+		} else if (!empty($_POST['auth_user2'])) {
 			$user = $_POST['auth_user2'];
-		else 
+		} else {
 			$user = 'unknown';
+		}
 		captiveportal_logportalauth($user ,$clientmac,$clientip,"ERROR");
 		portal_reply_page($redirurl, "error", $errormsg);
 	}
@@ -218,8 +223,9 @@ EOD;
 		//check against local user manager
 		$loginok = local_backed($_POST['auth_user'], $_POST['auth_pass']);
 
-		if ($loginok && isset($cpcfg['localauth_priv']))
+		if ($loginok && isset($cpcfg['localauth_priv'])) {
 			$loginok = userHasPrivilege(getUserEntry($_POST['auth_user']), "user-services-captiveportal-login");
+		}
 
 		if ($loginok){
 			captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,"LOGIN");
@@ -228,8 +234,9 @@ EOD;
 			captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,"FAILURE");
 			portal_reply_page($redirurl, "error", $errormsg);
 		}
-	} else
+	} else {
 		portal_reply_page($redirurl, "error", $errormsg);
+	}
 
 } else if ($_POST['accept'] && $clientip && $cpcfg['auth_method'] == "none") {
 	captiveportal_logportalauth("unauthenticated",$clientmac,$clientip,"ACCEPT");
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc
index ed072cf..b583429 100644
--- a/usr/local/captiveportal/radius_accounting.inc
+++ b/usr/local/captiveportal/radius_accounting.inc
@@ -7,30 +7,30 @@
     Copyright (c) 2006, Jonathan De Graeve <jonathan.de.graeve@imelda.be>
     All rights reserved.
 
-    Redistribution and use in source and binary forms, with or without 
-    modification, are permitted provided that the following conditions 
+    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 
+    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 
+    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.
-    3. The names of the authors may not be used to endorse or promote products 
+    3. The names of the authors may not be used to endorse or promote products
        derived from this software without specific prior written permission.
 
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    This code cannot simply be copied and put under the GNU Public License or 
+    This code cannot simply be copied and put under the GNU Public License or
     any other GPL-like (LGPL, GPL2) License.
 
         This code is made possible thx to samples made by Michael Bretterklieber <michael@bretterklieber.com>
@@ -45,7 +45,7 @@
 define('GIGAWORDS_RIGHT_OPERAND', '4294967296'); // 2^32
 
 /*
-RADIUS ACCOUNTING START 
+RADIUS ACCOUNTING START
 -----------------------
 */
 
@@ -202,9 +202,9 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
         $racct = new Auth_RADIUS_Acct_Stop;
 
     /*
-    Add support for more then one radiusserver. 
-    At most 10 servers may be specified. 
-    When multiple servers are given, they are tried in round-robin fashion until a valid response is received 
+    Add support for more then one radiusserver.
+    At most 10 servers may be specified.
+    When multiple servers are given, they are tried in round-robin fashion until a valid response is received
     */
     foreach ($radiusservers as $radsrv) {
         // Add a new server to our instance
diff --git a/usr/local/captiveportal/radius_authentication.inc b/usr/local/captiveportal/radius_authentication.inc
index 5f24506..9938e24 100644
--- a/usr/local/captiveportal/radius_authentication.inc
+++ b/usr/local/captiveportal/radius_authentication.inc
@@ -6,30 +6,30 @@
     Copyright (c) 2006, Jonathan De Graeve <jonathan.de.graeve@imelda.be>
     All rights reserved.
 
-    Redistribution and use in source and binary forms, with or without 
-    modification, are permitted provided that the following conditions 
+    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 
+    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 
+    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.
-    3. The names of the authors may not be used to endorse or promote products 
+    3. The names of the authors may not be used to endorse or promote products
        derived from this software without specific prior written permission.
 
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    This code cannot simply be copied and put under the GNU Public License or 
+    This code cannot simply be copied and put under the GNU Public License or
     any other GPL-like (LGPL, GPL2) License.
 
         This code is made possible thx to samples made by Michael Bretterklieber <michael@bretterklieber.com>
@@ -80,9 +80,9 @@ function RADIUS_AUTHENTICATION($username,$password,$radiusservers,$clientip,$cli
     $rauth = new $classname($username, $password);
 
     /*
-     * Add support for more then one radiusserver. 
-     * At most 10 servers may be specified. 
-     * When multiple servers are given, they are tried in round-robin fashion until a valid response is received 
+     * Add support for more then one radiusserver.
+     * At most 10 servers may be specified.
+     * When multiple servers are given, they are tried in round-robin fashion until a valid response is received
      */
     foreach ($radiusservers as $radsrv) {
         // Add a new server to our instance
@@ -126,7 +126,7 @@ function RADIUS_AUTHENTICATION($username,$password,$radiusservers,$clientip,$cli
 
     if (PEAR::isError($rauth->start())) {
         $retvalue['auth_val'] = 1;
-        $retvalue['error'] = $rauth->getError(); 
+        $retvalue['error'] = $rauth->getError();
 
         // If we encounter an error immediately stop this function and go back
         $rauth->close();