X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Fweb.php;h=6baae23c14632b4884a1e170f439aec3ec9589f2;hp=87e7bf46854b638e92e9a194eb357f183a15ba33;hb=60673f4f00bab805471fcbb85c8816aebb3a9582;hpb=c184472f1c4206a3bcd76ff8e9d27dc2eb1a4c4c

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index 87e7bf4..6baae23 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -83,13 +83,17 @@ function CBFBuildHomePage($urls)
 {
 	echo "Must remember this, gotta rules could apply to multiple zones not just one<br>";
 	echo "i.e.: add rule reject from object/host/hostname to address6/2003::123 in zones Zone/zonename/rulenum Zone/zonename/rulenum";
-	$conf = new Config();
-	$conf->loadConfig();
+	
+	$comms = new Comms();
 	
 	echo "<pre>";
-	print_r($conf->getConfig());
+	print_r($comms->getConfig(0));
+	echo "\n\n\n";
+	print_r($comms->getConfig(1));
+	echo "\n\n\n";
+	print_r($comms->getConfig(2));
 	echo "\n\n\n";
-	print_r($conf->getBootConfig());
+	print_r($comms->getConfig(3));
 	echo "</pre>";
 	
 }
@@ -126,7 +130,7 @@ function CBFWAddMessage($messagelev, $message)
 
 function CBFWMessageBuilder()
 {
-
+	echo "message";
 }
 
 function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW", $bodyfunctiondata=null)
@@ -173,9 +177,11 @@ function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="C
 	
 	// page top
 	echo "<h1>CBFW</h1><br>";
-	echo "<table><tr><td>";
+	echo "<table><tr width=\"100%\"><td>";
 	CBFWMessageBuilder();
-	echo "<td></tr><tr><td>";
+	echo "<td><td><align=\"right\">";
+	CBFWConfigStatus();
+	echo "</align></td></tr><tr><td>";
 	
 	// menu, then body
 	echo "<table><tr><td>";
@@ -226,6 +232,34 @@ function cbfw_getLastSeen($ip, $data)
 	
 }
 
+function CBFWConfigStatus()
+{
+	$comms = new Comms();
+	
+	$conf0 = $comms->getConfig(0);
+	$conf1 = $comms->getConfig(2);
+	$conf2 = $comms->getConfig(3);
+	
+	if($conf1["status"] == "nochange") {
+		$saved = "Current";
+		$running = "Current";
+	} else {
+		$saved = "Old";
+		$running = "Current";		
+	}
+	if($conf2["status"] == "nochange") {
+		$client = "Current";
+	} else {
+		$ch = $conf2["status"];
+		$client = "$ch Changes";
+	}
+	
+	
+	echo "Saved Config: $saved<br>";
+	echo "Running Config: $running<br>";
+	echo "Client Config: $client<br>";
+}
+
 function cbfw_tdiffToAgo($time_in_sec)
 {
 	$tdiff = $time_in_sec;