7 files changed, 87 insertions, 77 deletions

diff --git a/usr/local/bin/3gstats.php b/usr/local/bin/3gstats.php
index a8a8fec..daf0500 100755
--- a/usr/local/bin/3gstats.php
+++ b/usr/local/bin/3gstats.php
@@ -35,7 +35,7 @@ $record['bwdownstream'] = 0;
 $record['simstate'] = 0;
 $record['service'] = 0;
 
-while(true) {
+while (true) {
 	$string = "";
 	$string = fgets($handle, 256);
 
@@ -44,7 +44,7 @@ while(true) {
 	$elements[0] = trim($elements[0]);
 	$elements[1] = trim($elements[1]);
 
-	switch($elements[0]) {
+	switch ($elements[0]) {
 		case "^MODE":
 			$record['mode'] = $elements[1];
 			break;
@@ -70,7 +70,7 @@ while(true) {
 			break;
 	}
 
-	if($i > 10) {
+	if ($i > 10) {
 		$csv = $header;
 		$csv .= implode(",", $record);
 		$csv .= "\n";
diff --git a/usr/local/bin/beep.sh b/usr/local/bin/beep.sh
index 29a918c..ed9382d 100755
--- a/usr/local/bin/beep.sh
+++ b/usr/local/bin/beep.sh
@@ -17,7 +17,7 @@ if [ -f /var/log/dmesg.boot ]; then
 	fi
 fi
 
-# Check for different HZ 
+# Check for different HZ
 if [ -f /boot/loader.conf ]; then
 	HZ=`/usr/bin/grep -c kern.hz /boot/loader.conf`
 	if [ "$HZ" = "1" ]; then
@@ -25,19 +25,19 @@ if [ -f /boot/loader.conf ]; then
 	fi
 fi
 
-if [ -c "/dev/speaker" ]; then	
-		if [ "$1" = "start" ]; then
-			/usr/local/bin/beep -p 500 $NOTELENGTH
-			/usr/local/bin/beep -p 400 $NOTELENGTH
-			/usr/local/bin/beep -p 600 $NOTELENGTH
-			/usr/local/bin/beep -p 800 $NOTELENGTH
-			/usr/local/bin/beep -p 800 $NOTELENGTH
-		fi
-		if [ "$1" = "stop" ]; then
-			/usr/local/bin/beep -p 600 $NOTELENGTH
-			/usr/local/bin/beep -p 800 $NOTELENGTH
-			/usr/local/bin/beep -p 500 $NOTELENGTH
-			/usr/local/bin/beep -p 400 $NOTELENGTH
-			/usr/local/bin/beep -p 400 $NOTELENGTH
-		fi
+if [ -c "/dev/speaker" ]; then
+	if [ "$1" = "start" ]; then
+		/usr/local/bin/beep -p 500 $NOTELENGTH
+		/usr/local/bin/beep -p 400 $NOTELENGTH
+		/usr/local/bin/beep -p 600 $NOTELENGTH
+		/usr/local/bin/beep -p 800 $NOTELENGTH
+		/usr/local/bin/beep -p 800 $NOTELENGTH
+	fi
+	if [ "$1" = "stop" ]; then
+		/usr/local/bin/beep -p 600 $NOTELENGTH
+		/usr/local/bin/beep -p 800 $NOTELENGTH
+		/usr/local/bin/beep -p 500 $NOTELENGTH
+		/usr/local/bin/beep -p 400 $NOTELENGTH
+		/usr/local/bin/beep -p 400 $NOTELENGTH
+	fi
 fi
diff --git a/usr/local/bin/captiveportal_gather_stats.php b/usr/local/bin/captiveportal_gather_stats.php
index c076636..11cb2b9 100644
--- a/usr/local/bin/captiveportal_gather_stats.php
+++ b/usr/local/bin/captiveportal_gather_stats.php
@@ -2,31 +2,31 @@
 <?php
 /* $Id$ */
 /*
-        captiveportal_gather_stats.php
-        Copyright (C) 2011 Warren Baker
-        Copyright (C) 2013-2015 Electric Sheep Fencing, LP
-        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
-        AUTHOR 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.
+	captiveportal_gather_stats.php
+	Copyright (C) 2011 Warren Baker
+	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
+	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
+	AUTHOR 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.
 */
 
 require_once("functions.inc");
@@ -51,8 +51,9 @@ $current_user_count = 0;
 /* tmp file to use to store old data (per interface)*/
 $tmpfile = "{$g['vardb_path']}/captiveportal_online_users";
 
-if(empty($type))
+if (empty($type)) {
 	exit;
+}
 
 /* echo the rrd required syntax */
 echo "N:";
@@ -68,22 +69,24 @@ if ($type == "loggedin") {
 	if ($fd) {
 		while (!feof($fd)) {
 			$line = trim(fgets($fd));
-			if($line)
+			if ($line) {
 				$previous_user_timestamp = $line;
-			else
+			} else {
 				$previous_user_timestamp = 0;
+			}
 		}
 	} else {
 		$previous_user_timestamp = 0;
 	}
 	@fclose($fd);
 
-	foreach($cpdb as $user) {
+	foreach ($cpdb as $user) {
 		$user_ip = $user[2];
 		// Record the timestamp
 		$timestamp = $user[0];
-		if ($timestamp > $previous_user_timestamp)
+		if ($timestamp > $previous_user_timestamp) {
 			$current_user_count = $current_user_count + 1;
+		}
 	}
 
 	// Write out the latest timestamp but not if it is empty
@@ -98,13 +101,14 @@ if ($type == "loggedin") {
 	/* If $timestamp is less than or equal to previous_user_timestamp return 0,
 	 * as we only want the 'X' number of users logged in since last RRD poll.
 	 */
-	if($timestamp <= $previous_user_timestamp)
+	if ($timestamp <= $previous_user_timestamp) {
 		$result = 0;
-	else {
+	} else {
 		$result = $current_user_count;
 	}
-} elseif ($type == "concurrent")
+} elseif ($type == "concurrent") {
 	$result = $no_users;
+}
 
 echo "$result";
 
diff --git a/usr/local/bin/easyrule b/usr/local/bin/easyrule
index 9850aee..f00a7cb 100755
--- a/usr/local/bin/easyrule
+++ b/usr/local/bin/easyrule
@@ -10,11 +10,11 @@
 	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.
+	   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.
+	   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
@@ -50,29 +50,32 @@ function pconfig_to_address(&$adr, $padr, $pmask, $pnot=false, $pbeginport=0, $p
 
 	$adr = array();
 
-	if ($padr == "any")
+	if ($padr == "any") {
 		$adr['any'] = true;
-	else if (is_specialnet($padr))
+	} else if (is_specialnet($padr)) {
 		$adr['network'] = $padr;
-	else {
+	} else {
 		$adr['address'] = $padr;
-		if ($pmask != 32)
+		if ($pmask != 32) {
 			$adr['address'] .= "/" . $pmask;
+		}
 	}
 
-	if ($pnot)
+	if ($pnot) {
 		$adr['not'] = true;
-	else
+	} else {
 		unset($adr['not']);
+	}
 
 	if (($pbeginport != 0) && ($pbeginport != "any")) {
-		if ($pbeginport != $pendport)
+		if ($pbeginport != $pendport) {
 			$adr['port'] = $pbeginport . "-" . $pendport;
-		else
+		} else {
 			$adr['port'] = $pbeginport;
+		}
 	}
 
-	if(is_alias($pbeginport)) {
+	if (is_alias($pbeginport)) {
 		$adr['port'] = $pbeginport;
 	}
 }
@@ -81,12 +84,14 @@ function pconfig_to_address(&$adr, $padr, $pmask, $pnot=false, $pbeginport=0, $p
 function is_specialnet($net) {
 	global $specialsrcdst;
 
-	if(!$net)
+	if (!$net) {
 		return false;
-	if (in_array($net, $specialsrcdst))
+	}
+	if (in_array($net, $specialsrcdst)) {
 		return true;
-	else
+	} else {
 		return false;
+	}
 }
 
 
diff --git a/usr/local/bin/filterparser.php b/usr/local/bin/filterparser.php
index da1f98e..bec8016 100755
--- a/usr/local/bin/filterparser.php
+++ b/usr/local/bin/filterparser.php
@@ -31,8 +31,8 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 
- A quick CLI log parser. 
- Examples: 
+ A quick CLI log parser.
+ Examples:
 	clog /var/log/filter.log | tail -50 | /usr/local/www/filterparser.php
 	clog -f /var/log/filter.log | /usr/local/www/filterparser.php
 */
@@ -45,7 +45,7 @@ include_once("filter_log.inc");
 
 $log = fopen("php://stdin", "r");
 $lastline = "";
-while(!feof($log)) { 
+while (!feof($log)) {
 	$line = fgets($log);
 	$line = rtrim($line);
 	$flent = parse_filter_line(trim($line));
diff --git a/usr/local/bin/mail.php b/usr/local/bin/mail.php
index a09f5c6..1e62b81 100755
--- a/usr/local/bin/mail.php
+++ b/usr/local/bin/mail.php
@@ -7,18 +7,19 @@ $options = getopt("s::");
 
 $message = "";
 
-if($options['s'] <> "") {
+if ($options['s'] <> "") {
 	$subject = $options['s'];
 }
 
 
 $in = file("php://stdin");
-foreach($in as $line){
+foreach ($in as $line){
 	$message .= "$line";
 }
 
-if (!empty($subject))
+if (!empty($subject)) {
 	send_smtp_message($message, $subject);
-else
+} else {
 	send_smtp_message($message);
+}
 ?>
\ No newline at end of file
diff --git a/usr/local/bin/ping_hosts.sh b/usr/local/bin/ping_hosts.sh
index d584dd1..eef64f3 100755
--- a/usr/local/bin/ping_hosts.sh
+++ b/usr/local/bin/ping_hosts.sh
@@ -5,9 +5,9 @@
 # (C)2006 Scott Ullrich
 # All rights reserved.
 
-# Format of file should be deliminted by |
-#  Field 1:  Source ip
-#  Field 2:  Destination ip
+# Format of file should be delimited by |
+#  Field 1:  Source IP
+#  Field 2:  Destination IP
 #  Field 3:  Ping count
 #  Field 4:  Script to run when service is down
 #  Field 5:  Script to run once service is restored