From 501e25be3c4a9ed684c743bf23c3c0cb842172f7 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 9 Dec 2015 18:20:28 +0545 Subject: Widgets format and white space --- .../www/widgets/widgets/carp_status.widget.php | 26 +++-- .../www/widgets/widgets/dyn_dns_status.widget.php | 4 +- .../local/www/widgets/widgets/gateways.widget.php | 22 ++-- .../widgets/widgets/installed_packages.widget.php | 6 +- src/usr/local/www/widgets/widgets/ipsec.widget.php | 7 +- .../www/widgets/widgets/ntp_status.widget.php | 10 +- .../www/widgets/widgets/services_status.widget.php | 2 +- .../widgets/widgets/system_information.widget.php | 127 ++++++++++++--------- .../www/widgets/widgets/traffic_graphs.widget.php | 3 +- .../www/widgets/widgets/wake_on_lan.widget.php | 4 +- 10 files changed, 121 insertions(+), 90 deletions(-) (limited to 'src/usr') diff --git a/src/usr/local/www/widgets/widgets/carp_status.widget.php b/src/usr/local/www/widgets/widgets/carp_status.widget.php index 642b0f4..e5c2e0e 100644 --- a/src/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/carp_status.widget.php @@ -93,20 +93,30 @@ $carp_enabled = get_carp_status(); $status = "DISABLED"; echo ''; } else { - if($status == "MASTER") { + if ($status == "MASTER") { echo ''; - } else if($status == "BACKUP") { + } else if ($status == "BACKUP") { echo ''; - } else if($status == "INIT") { + } else if ($status == "INIT") { echo ''; } } - if ($ipaddress){ ?>   + if ($ipaddress) { +?> +     - - + + + + No CARP Interfaces Defined. Click here to configure CARP. - + diff --git a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index cb4612e..24b8c0e 100644 --- a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -1,6 +1,6 @@ \n"); @@ -167,7 +167,7 @@ if($_REQUEST && $_REQUEST['ajax']) { print( "" . ($gateways_status[$gname] ? htmlspecialchars($gateways_status[$gname]['loss']) : gettext("Pending")) . "\n"); print('' . $online . "\n"); print("\n"); - } + } print("\n"); @@ -227,23 +227,23 @@ if ($_POST) {
Display: diff --git a/src/usr/local/www/widgets/widgets/installed_packages.widget.php b/src/usr/local/www/widgets/widgets/installed_packages.widget.php index 5b85b6b..255212a 100644 --- a/src/usr/local/www/widgets/widgets/installed_packages.widget.php +++ b/src/usr/local/www/widgets/widgets/installed_packages.widget.php @@ -66,7 +66,7 @@ require_once("functions.inc"); require_once("/usr/local/www/widgets/include/installed_packages.inc"); require_once("pkg-utils.inc"); -if($_REQUEST && $_REQUEST['ajax']) { +if ($_REQUEST && $_REQUEST['ajax']) { $package_list = get_pkg_info(); $installed_packages = array_filter($package_list, function($v) { return (isset($v['installed']) || isset($v['broken'])); @@ -153,13 +153,13 @@ if($_REQUEST && $_REQUEST['ajax']) { print( "\n"); print( ''."\n"); - if($upgradeavail) { + if ($upgradeavail) { print( ''."\n"); } else { print( ''."\n"); } - if(!isset($g['disablepackageinfo']) && $pkg['www'] != 'UNKNOWN') { + if (!isset($g['disablepackageinfo']) && $pkg['www'] != 'UNKNOWN') { print( ''."\n"); } diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php index bffa87f..5011e3a 100644 --- a/src/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php @@ -182,8 +182,9 @@ if ($_REQUEST && $_REQUEST['ajax']) { case "mobile" : foreach ($mobile['pool'] as $pool) { - if (!is_array($pool['lease'])) + if (!is_array($pool['lease'])) { continue; + } foreach ($pool['lease'] as $muser) { print(" \n"); @@ -259,7 +260,7 @@ if (isset($config['ipsec']['phase2'])): ?>