X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Fweb.php;h=f28b21f9e071af97cc5999e5d12ca4e9e4685801;hp=562d1db89e6001334dd87e570af82f6896bb6f6c;hb=86842492eae6203c9df0df46363b4e809d577c70;hpb=fa4d5e8e3250b981ee563f21df08c729dd3d4c57

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index 562d1db..f28b21f 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -55,13 +55,13 @@ class CBFWWeb {
 					CBFWInterfacesPage($url_s);
 					break;
 				case "objects":
-					$bodyFunction = "CBFWObjectsPage";
+					CBFWObjectsPage($url_s);
 					break;
 				case "rules":
 					$bodyFunction = "CBFWRulesPage";
 					break;
 				case "admin":
-					$bodyFunction = "CBFWAdminPage";
+					CBFWAdminPage($url_s);
 					break;
 				default:
 					$bodyFunction = findUrl($url_s);
@@ -74,11 +74,6 @@ class CBFWWeb {
 }
 
 
-function CBFWAdminPage($urls)
-{
-	echo "im an admin page";
-}
-
 function CBFBuildHomePage($urls)
 {
 	echo "Must remember this, gotta rules could apply to multiple zones not just one<br>";
@@ -130,7 +125,7 @@ function CBFWAddMessage($messagelev, $message)
 
 function CBFWMessageBuilder()
 {
-
+	echo "message";
 }
 
 function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW", $bodyfunctiondata=null)
@@ -177,9 +172,11 @@ function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="C
 	
 	// page top
 	echo "<h1>CBFW</h1><br>";
-	echo "<table><tr><td>";
+	echo "<table width=\"100%\"><tr width=\"100%\"><td>";
 	CBFWMessageBuilder();
-	echo "<td></tr><tr><td>";
+	echo "<td><td align=\"right\">";
+	CBFWConfigStatus();
+	echo "</td></tr><tr><td>";
 	
 	// menu, then body
 	echo "<table><tr><td>";
@@ -230,6 +227,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;