From 68f291ffe2e8e6e5d9470076365fd1127e7f3655 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 9 Sep 2010 21:25:49 +0000
Subject: Ticket #876. Show all gateways even though apinger is not monitoring
 them, for various reasons, this removes user confusion in the status pages.

---
 usr/local/www/includes/functions.inc.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'usr/local/www/includes')

diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php
index 677c2fd..8eff06a 100644
--- a/usr/local/www/includes/functions.inc.php
+++ b/usr/local/www/includes/functions.inc.php
@@ -24,19 +24,22 @@ function get_stats() {
 }
 
 function get_gatewaystats() {
+	$a_gateways = return_gateways_array();
 	$gateways_status = array();
-	$gateways_status = return_gateways_status();
+	$gateways_status = return_gateways_status(true);
 	$data = "";
 	$isfirst = true;
-	foreach($gateways_status as $gw) {
+	foreach($a_gateways as $gname => $gw) {
 		if(!$isfirst) 
 			$data .= ",";
 		$isfirst = false;
 		$data .= $gw['name'] . ",";
-		$data .= lookup_gateway_ip_by_name($gw['name']) . ",";
-		$data .= $gw['delay'] . ",";
-		$data .= $gw['loss'] . ",";
-        switch(strtolower($gw['status'])) {
+		$data .= lookup_gateway_ip_by_name($gname) . ",";
+		if ($gateways_status[$gname]) {
+			$gws = $gateways_status[$gname];
+			$data .= $gws['delay'] . ",";
+			$data .= $gws['loss'] . ",";
+        		switch(strtolower($gws['status'])) {
 			case "none":
 				$online = "Online";
 				$bgcolor = "lightgreen";
@@ -55,6 +58,11 @@ function get_gatewaystats() {
 				break;
 			default:
 				$online = "Gathering data";
+				break;
+			}
+		} else {
+			$online = "Unknown";
+			$bgcolor = "lightgray";
 		}
 		$data .= "<table><tr><td bgcolor=\"$bgcolor\" > $online </td></td></tr></table>";
 	}
@@ -257,4 +265,4 @@ function get_interfacestatus() {
 	return $data;
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.1