From c7617a58ce0bd1728b6cddaebb95e623fe3d10b6 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 1 Aug 2015 10:47:39 +0200 Subject: gwled - code style fixes, add copyright headers --- config/gwled/gwled.inc | 64 ++++++++++++++++++++++++++++++++++++++------------ 1 file 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 @@ 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"); + } } ?> -- cgit v1.2.3