aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-08-01 10:47:39 +0200
committerdoktornotor <notordoktor@gmail.com>2015-08-01 10:47:39 +0200
commitc7617a58ce0bd1728b6cddaebb95e623fe3d10b6 (patch)
tree53e10da39849d3e8482a66e4b828886e1570720a
parent7b9a2c43f8ac2fa413992d9dc91eb045d7cee9a2 (diff)
downloadpfsense-packages-c7617a58ce0bd1728b6cddaebb95e623fe3d10b6.tar.gz
pfsense-packages-c7617a58ce0bd1728b6cddaebb95e623fe3d10b6.tar.bz2
pfsense-packages-c7617a58ce0bd1728b6cddaebb95e623fe3d10b6.zip
gwled - code style fixes, add copyright headers
-rw-r--r--config/gwled/gwled.inc64
1 files changed, 49 insertions, 15 deletions
diff --git a/config/gwled/gwled.inc b/config/gwled/gwled.inc
index dad6fe69..ce6f23d9 100644
--- a/config/gwled/gwled.inc
+++ b/config/gwled/gwled.inc
@@ -1,16 +1,45 @@
<?php
+/*
+ gwled.inc
+ part of pfSense (https://www.pfSense.org/)
+ Copyright (C) 2011 Jim Pingle
+ Copyright (C) 2015 ESF, LLC
+ 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");
function gwled_running () {
- return ((int)exec('pgrep -f gwled | wc -l') > 0);
+ return ((int)exec('/bin/pgrep -f gwled | /usr/bin/wc -l') > 0);
}
function sync_package_gwled() {
global $config;
$gwled_config = $config['installedpackages']['gwled']['config'][0];
led_normalize();
- /* kill all instances of gwled */
- if(gwled_running()) {
+ /* Kill all instances of gwled */
+ if (gwled_running()) {
gwled_stop();
}
gwled_start();
@@ -19,14 +48,15 @@ function sync_package_gwled() {
function gwled_start() {
global $config;
$gwled_config = $config['installedpackages']['gwled']['config'][0];
- if (!($gwled_config['enable']))
+ if (!($gwled_config['enable'])) {
return;
+ }
// How often to run the check, in seconds.
$interval = 15;
- if (($gwled_config['enable_led2']) && ($gwled_config['gw_led2'])
- || ($gwled_config['enable_led3']) && ($gwled_config['gw_led3'])) {
+ if (($gwled_config['enable_led2']) && ($gwled_config['gw_led2']) ||
+ ($gwled_config['enable_led3']) && ($gwled_config['gw_led3'])) {
mwexec("/usr/local/bin/minicron {$interval} /var/run/gwled.pid /usr/local/bin/gwled.php");
mwexec_bg("/usr/local/bin/gwled.php");
}
@@ -38,10 +68,11 @@ function gwled_stop() {
function validate_form_gwled($post, &$input_errors) {
/* Make sure both aren't using the same interface */
- if (($post['gw_led2']) && ($post['gw_led3']) &&
+ if (($post['gw_led2']) && ($post['gw_led3']) &&
(($post['enable_led2']) && ($post['enable_led3'])) &&
- ($post['gw_led2'] == $post['gw_led3']))
- $input_errors[] = 'You cannot set two LEDs for a single gateway. Please choose seperate interfaces.';
+ ($post['gw_led2'] == $post['gw_led3'])) {
+ $input_errors[] = 'You cannot set two LEDs for a single gateway. Please choose seperate interfaces.';
+ }
}
function gwled_get_gateways() {
@@ -49,7 +80,7 @@ function gwled_get_gateways() {
foreach ($gateways as $gateway) {
$tmp["name"] = "{$gateway['name']} (Monitor: {$gateway['monitor']})";
- $tmp["value"] = $gateway['name'];
+ $tmp["value"] = $gateway['name'];
$gws[] = $tmp;
}
return $gws;
@@ -59,18 +90,21 @@ function gwled_set_status($gateway, $led) {
$a_gateways = return_gateways_array();
$gateways_status = array();
$gateways_status = return_gateways_status(true);
+
if ($gateways_status[$gateway]) {
$status = $gateways_status[$gateway]['status'];
- if (stristr($status, "down"))
+ if (stristr($status, "down")) {
led_blink($led, "veryfast");
- elseif (stristr($status, "loss"))
+ } elseif (stristr($status, "loss")) {
led_blink($led, "fast");
- elseif (stristr($status, "delay"))
+ } elseif (stristr($status, "delay")) {
led_blink($led, "medium");
- elseif ($status == "none")
+ } elseif ($status == "none") {
led_on($led);
- } else
+ }
+ } else {
led_blink($led, "veryfast");
+ }
}
?>