From 630533c484ff6ffc735b70b064efc041100a2b9f Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 9 Dec 2006 02:17:20 +0000
Subject: * Cleanup status * Import XMLRPC file

---
 packages/tinydns/tinydns_status.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'packages/tinydns/tinydns_status.php')

diff --git a/packages/tinydns/tinydns_status.php b/packages/tinydns/tinydns_status.php
index a35d6b5b..f8ddda61 100644
--- a/packages/tinydns/tinydns_status.php
+++ b/packages/tinydns/tinydns_status.php
@@ -63,21 +63,31 @@ include("head.inc");
 	<tr>
           <td width="80%" class="listhdrr">IP</td>
           <td width="10%" class="listhdrr">Status</td>
+          <td width="10%" class="listhdrr">In Service</td>
           <td width="10%" class="listhdrr">Response time</td>
 		</tr>
 
 <?php
 $pingdir = return_dir_as_array("/var/db/pingstatus");
+if(file_exists("/service/tinydns/root/data"))
+	$tinydns_data = file_get_contents("/service/tinydns/root/data");
+else
+	$tinydns_data = "";
 foreach($config['installedpackages']['tinydnsdomains']['config'] as $ping) {
 	if($ping['recordtype'] == "SOA")
 		continue;
 	if(!$ping['row'])
 		continue;
 	$ipaddress = $ping['ipaddress'];
+	$hostname  = $ping['hostname'];
 	$status = file_get_contents("/var/db/pingstatus/$ipaddress");
+	if(stristr($tinydns_data, $ipaddress))
+		$inservice = "<FONT COLOR='GREEN'>YES</FONT>";
+	else
+		$inservice = "<FONT COLOR='BLUE'>NO</FONT>";
 	echo "<tr>";
 	echo "<td class=\"listlr\">";
-	echo $ipaddress;
+	echo "$hostname<br>$ipaddress";
 	echo "</td>";
 	echo "<td class=\"listlr\">";
 	if(stristr($status,"DOWN"))
@@ -85,6 +95,11 @@ foreach($config['installedpackages']['tinydnsdomains']['config'] as $ping) {
 	else
 		echo $status;
 	echo "</td>";
+
+	echo "<td class=\"listlr\">";
+	echo $inservice;
+	echo "</td>";
+
 	echo "<td class=\"listlr\">";
 	if(file_exists("/var/db/pingmsstatus/$ipaddress"))
 		$msstatus = file_get_contents("/var/db/pingmsstatus/$ipaddress");
@@ -100,6 +115,12 @@ foreach($config['installedpackages']['tinydnsdomains']['config'] as $ping) {
 		echo "<tr>";
 		echo "<td class=\"listlr\">&nbsp;&nbsp;&nbsp;&nbsp;|->&nbsp;&nbsp;";
 		echo $ipaddress;
+		if($row['loadbalance'])
+			echo " (LB)";
+		if(stristr($tinydns_data ,$row['failoverip']))
+			$inservice = "<FONT COLOR='GREEN'>YES</FONT>";
+		else
+			$inservice = "<FONT COLOR='BLUE'>NO</FONT>";
 		echo "</td>";
 		echo "<td class=\"listlr\">";
 		if(stristr($status,"DOWN"))
@@ -107,6 +128,11 @@ foreach($config['installedpackages']['tinydnsdomains']['config'] as $ping) {
 		else
 			echo $status;
 		echo "</td>";
+
+		echo "<td class=\"listlr\">";
+		echo $inservice;
+		echo "</td>";
+
 		echo "<td class=\"listlr\">";
 		if(file_exists("/var/db/pingmsstatus/$ipaddress"))
 			$msstatus = file_get_contents("/var/db/pingmsstatus/$ipaddress");
-- 
cgit v1.2.3