From 9543799a2005d0e2d11c80e3df01e2c1b7a2905d Mon Sep 17 00:00:00 2001 From: Jos Schellevis Date: Thu, 11 Dec 2014 10:44:03 +0000 Subject: [PATCH] Primarily Dashboard updates and fixes --- src/www/{_archive => }/classes/maintable.inc | 0 src/www/index.php | 8 ++-- src/www/load_balancer_monitor.php | 1 + src/www/load_balancer_pool.php | 3 +- src/www/load_balancer_relay_action.php | 1 + src/www/load_balancer_relay_protocol.php | 1 + src/www/load_balancer_virtual_server.php | 1 + src/www/services_captiveportal.php | 3 +- .../services_captiveportal_filemanager.php | 3 +- src/www/services_captiveportal_ip.php | 3 +- src/www/services_captiveportal_mac.php | 3 +- src/www/services_captiveportal_vouchers.php | 3 +- src/www/system_hasync.php | 1 + .../widgets/captive_portal_status.widget.php | 14 +++---- .../widgets/widgets/carp_status.widget.php | 14 +++---- .../widgets/widgets/dyn_dns_status.widget.php | 10 ++--- src/www/widgets/widgets/gateways.widget.php | 40 +++++++++---------- ...s.widget.php => interface_list.widget.php} | 0 .../widgets/interface_statistics.widget.php | 20 +++++----- 19 files changed, 70 insertions(+), 59 deletions(-) rename src/www/{_archive => }/classes/maintable.inc (100%) rename src/www/widgets/widgets/{interfaces.widget.php => interface_list.widget.php} (100%) diff --git a/src/www/_archive/classes/maintable.inc b/src/www/classes/maintable.inc similarity index 100% rename from src/www/_archive/classes/maintable.inc rename to src/www/classes/maintable.inc diff --git a/src/www/index.php b/src/www/index.php index 1935f3e18..70a4f3f5b 100644 --- a/src/www/index.php +++ b/src/www/index.php @@ -404,7 +404,7 @@ echo $jscriptstr;

\n"; + echo "\"logo\"

\n"; ?>

@@ -530,8 +530,8 @@ echo $jscriptstr; ?>
-
- + +
    @@ -577,7 +577,7 @@ echo $jscriptstr;
-
+
diff --git a/src/www/load_balancer_monitor.php b/src/www/load_balancer_monitor.php index 18cfd9d46..d54071e70 100644 --- a/src/www/load_balancer_monitor.php +++ b/src/www/load_balancer_monitor.php @@ -44,6 +44,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); require_once("util.inc"); +require_once("classes/maintable.inc"); if (!is_array($config['load_balancer']['monitor_type'])) { $config['load_balancer']['monitor_type'] = array(); diff --git a/src/www/load_balancer_pool.php b/src/www/load_balancer_pool.php index 1c95e5f15..f15370d42 100644 --- a/src/www/load_balancer_pool.php +++ b/src/www/load_balancer_pool.php @@ -43,6 +43,7 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); +require_once("classes/maintable.inc"); if (!is_array($config['load_balancer']['lbpool'])) { $config['load_balancer']['lbpool'] = array(); @@ -157,7 +158,7 @@ $main_buttons = array(


- +
diff --git a/src/www/load_balancer_relay_action.php b/src/www/load_balancer_relay_action.php index 81025b21c..da4bc8bfb 100644 --- a/src/www/load_balancer_relay_action.php +++ b/src/www/load_balancer_relay_action.php @@ -43,6 +43,7 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); +require_once("classes/maintable.inc"); if (!is_array($config['load_balancer']['lbaction'])) { $config['load_balancer']['lbaction'] = array(); diff --git a/src/www/load_balancer_relay_protocol.php b/src/www/load_balancer_relay_protocol.php index 5ae16415d..1cddba89f 100644 --- a/src/www/load_balancer_relay_protocol.php +++ b/src/www/load_balancer_relay_protocol.php @@ -43,6 +43,7 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); +require_once("classes/maintable.inc"); if (!is_array($config['load_balancer']['lbprotocol'])) { $config['load_balancer']['lbprotocol'] = array(); diff --git a/src/www/load_balancer_virtual_server.php b/src/www/load_balancer_virtual_server.php index e3f8244e2..f569aa09f 100644 --- a/src/www/load_balancer_virtual_server.php +++ b/src/www/load_balancer_virtual_server.php @@ -44,6 +44,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); require_once("vslb.inc"); +require_once("classes/maintable.inc"); if (!is_array($config['load_balancer']['virtual_server'])) { $config['load_balancer']['virtual_server'] = array(); diff --git a/src/www/services_captiveportal.php b/src/www/services_captiveportal.php index 2dc19cd11..d7ce3e8e5 100644 --- a/src/www/services_captiveportal.php +++ b/src/www/services_captiveportal.php @@ -512,7 +512,8 @@ function enable_change(enable_change) { $tab_array[] = array(gettext("Captive portal(s)"), true, "services_captiveportal.php?zone={$cpzone}"); $tab_array[] = array(gettext("MAC"), false, "services_captiveportal_mac.php?zone={$cpzone}"); $tab_array[] = array(gettext("Allowed IP addresses"), false, "services_captiveportal_ip.php?zone={$cpzone}"); - $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); + // Hide Allowed Hostnames as this feature is currently not supported + // $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); $tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_vouchers.php?zone={$cpzone}"); $tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}"); display_top_tabs($tab_array, true); diff --git a/src/www/services_captiveportal_filemanager.php b/src/www/services_captiveportal_filemanager.php index a481f3669..cedc95e5d 100644 --- a/src/www/services_captiveportal_filemanager.php +++ b/src/www/services_captiveportal_filemanager.php @@ -158,7 +158,8 @@ $main_buttons = array( $tab_array[] = array(gettext("Captive portal(s)"), false, "services_captiveportal.php?zone={$cpzone}"); $tab_array[] = array(gettext("MAC"), false, "services_captiveportal_mac.php?zone={$cpzone}"); $tab_array[] = array(gettext("Allowed IP addresses"), false, "services_captiveportal_ip.php?zone={$cpzone}"); - $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); + // Hide Allowed Hostnames as this feature is currently not supported + // $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); $tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_vouchers.php?zone={$cpzone}"); $tab_array[] = array(gettext("File Manager"), true, "services_captiveportal_filemanager.php?zone={$cpzone}"); display_top_tabs($tab_array, true); diff --git a/src/www/services_captiveportal_ip.php b/src/www/services_captiveportal_ip.php index 32a501cc0..5d1c1a635 100644 --- a/src/www/services_captiveportal_ip.php +++ b/src/www/services_captiveportal_ip.php @@ -114,7 +114,8 @@ $main_buttons = array( $tab_array[] = array(gettext("Captive portal(s)"), false, "services_captiveportal.php?zone={$cpzone}"); $tab_array[] = array(gettext("MAC"), false, "services_captiveportal_mac.php?zone={$cpzone}"); $tab_array[] = array(gettext("Allowed IP addresses"), true, "services_captiveportal_ip.php?zone={$cpzone}"); - $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); + // Hide Allowed Hostnames as this feature is currently not supported + // $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); $tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_vouchers.php?zone={$cpzone}"); $tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}"); display_top_tabs($tab_array, true); diff --git a/src/www/services_captiveportal_mac.php b/src/www/services_captiveportal_mac.php index 420701f9d..a1af1f6b9 100644 --- a/src/www/services_captiveportal_mac.php +++ b/src/www/services_captiveportal_mac.php @@ -163,7 +163,8 @@ $main_buttons = array( $tab_array[] = array(gettext("Captive portal(s)"), false, "services_captiveportal.php?zone={$cpzone}"); $tab_array[] = array(gettext("MAC"), true, "services_captiveportal_mac.php?zone={$cpzone}"); $tab_array[] = array(gettext("Allowed IP addresses"), false, "services_captiveportal_ip.php?zone={$cpzone}"); - $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); + // Hide Allowed Hostnames as this feature is currently not supported + // $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); $tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_vouchers.php?zone={$cpzone}"); $tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}"); display_top_tabs($tab_array, true); diff --git a/src/www/services_captiveportal_vouchers.php b/src/www/services_captiveportal_vouchers.php index c65587264..922468a25 100644 --- a/src/www/services_captiveportal_vouchers.php +++ b/src/www/services_captiveportal_vouchers.php @@ -454,7 +454,8 @@ function enable_change(enable_change) { $tab_array[] = array(gettext("Captive portal(s)"), false, "services_captiveportal.php?zone={$cpzone}"); $tab_array[] = array(gettext("MAC"), false, "services_captiveportal_mac.php?zone={$cpzone}"); $tab_array[] = array(gettext("Allowed IP addresses"), false, "services_captiveportal_ip.php?zone={$cpzone}"); - $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); + // Hide Allowed Hostnames as this feature is currently not supported + // $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}"); $tab_array[] = array(gettext("Vouchers"), true, "services_captiveportal_vouchers.php?zone={$cpzone}"); $tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}"); display_top_tabs($tab_array, true); diff --git a/src/www/system_hasync.php b/src/www/system_hasync.php index d0ba41bb2..e3a643625 100755 --- a/src/www/system_hasync.php +++ b/src/www/system_hasync.php @@ -159,6 +159,7 @@ include("head.inc"); +   diff --git a/src/www/widgets/widgets/captive_portal_status.widget.php b/src/www/widgets/widgets/captive_portal_status.widget.php index 4700a5bea..e4ee5c199 100644 --- a/src/www/widgets/widgets/captive_portal_status.widget.php +++ b/src/www/widgets/widgets/captive_portal_status.widget.php @@ -88,14 +88,14 @@ if ($_GET['order']) { usort($cpdb_all, "clientcmp"); } ?> - +
- - - + + + - - + + @@ -108,7 +108,7 @@ if ($_GET['order']) { +
IP addressMAC addressIP addressMAC address
0)) echo htmlspecialchars(date("m/d/Y H:i:s", $cpent[11]));?> - x
diff --git a/src/www/widgets/widgets/carp_status.widget.php b/src/www/widgets/widgets/carp_status.widget.php index 60d02b6f5..1c9ddab01 100644 --- a/src/www/widgets/widgets/carp_status.widget.php +++ b/src/www/widgets/widgets/carp_status.widget.php @@ -37,7 +37,7 @@ require_once("/usr/local/www/widgets/include/carp_status.inc"); $carp_enabled = get_carp_status(); ?> - +
- cablenic  +   - + "; + echo ""; } else { if($status == "MASTER") { - echo "\"$status\""; + echo ""; } else if($status == "BACKUP") { - echo "\"$status\""; + echo ""; } else if($status == "INIT") { - echo "\"$status\""; + echo ""; } } if ($ipaddress){ ?>   diff --git a/src/www/widgets/widgets/dyn_dns_status.widget.php b/src/www/widgets/widgets/dyn_dns_status.widget.php index cde52c6ec..768f697fb 100644 --- a/src/www/widgets/widgets/dyn_dns_status.widget.php +++ b/src/www/widgets/widgets/dyn_dns_status.widget.php @@ -73,12 +73,12 @@ if($_REQUEST['getdyndnsstatus']) { ?> - +
- - - - + + + + diff --git a/src/www/widgets/widgets/gateways.widget.php b/src/www/widgets/widgets/gateways.widget.php index bc29c60db..06733b950 100644 --- a/src/www/widgets/widgets/gateways.widget.php +++ b/src/www/widgets/widgets/gateways.widget.php @@ -42,23 +42,23 @@ $counter = 1; ?> -
+
- - - - + + + + $gateway) { ?> - - + - - \n"; + echo "\n"; $counter++; ?> diff --git a/src/www/widgets/widgets/interfaces.widget.php b/src/www/widgets/widgets/interface_list.widget.php similarity index 100% rename from src/www/widgets/widgets/interfaces.widget.php rename to src/www/widgets/widgets/interface_list.widget.php diff --git a/src/www/widgets/widgets/interface_statistics.widget.php b/src/www/widgets/widgets/interface_statistics.widget.php index 98455c122..a88d31b63 100644 --- a/src/www/widgets/widgets/interface_statistics.widget.php +++ b/src/www/widgets/widgets/interface_statistics.widget.php @@ -81,34 +81,34 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); ?>
-
NameRTTLossStatus
+ - -
+
+
-
+
+ + $online$online
+
- + - + - + - + - + - + - +
   
Packets In
Packets Out
Bytes In
Bytes Out
Errors In
Errors Out
Collisions
- +
- +