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

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index f28b21f..7f76f11 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -5,6 +5,8 @@ $MENU_ITEMS["20_Objects"]["link"] = "$BASE_URL/objects";
 $MENU_ITEMS["20_Objects"]["name"] = "Objects"; 
 $MENU_ITEMS["30_Rules"]["link"] = "$BASE_URL/rules"; 
 $MENU_ITEMS["30_Rules"]["name"] = "Rules"; 
+$MENU_ITEMS["15_Routes"]["link"] = "$BASE_URL/routing"; 
+$MENU_ITEMS["15_Routes"]["name"] = "Routing"; 
 $MENU_ITEMS["10_Interfaces"]["link"] = "$BASE_URL/interfaces"; 
 $MENU_ITEMS["10_Interfaces"]["name"] = "Interfaces"; 
 $MENU_ITEMS["05_Admin"]["link"] = "$BASE_URL/admin"; 
@@ -57,9 +59,15 @@ class CBFWWeb {
 				case "objects":
 					CBFWObjectsPage($url_s);
 					break;
+				case "routing":
+					CBFWRoutingPage($url_s);
+					break;
 				case "rules":
 					$bodyFunction = "CBFWRulesPage";
 					break;
+				case "changes":
+					CBFWChangesPage($url_s);
+					break;
 				case "admin":
 					CBFWAdminPage($url_s);
 					break;
@@ -81,6 +89,8 @@ function CBFBuildHomePage($urls)
 	
 	$comms = new Comms();
 	
+	
+	CBFWAddMessage(rand(1,6), "i am a message");
 	echo "<pre>";
 	print_r($comms->getConfig(0));
 	echo "\n\n\n";
@@ -89,6 +99,10 @@ function CBFBuildHomePage($urls)
 	print_r($comms->getConfig(2));
 	echo "\n\n\n";
 	print_r($comms->getConfig(3));
+	echo "\n\n\n";
+	print_r($comms->getConfig(4));
+	echo "\n\n\n";
+	print_r($comms->getConfig(5));
 	echo "</pre>";
 	
 }
@@ -120,12 +134,70 @@ function gcam($m, $s)
 
 function CBFWAddMessage($messagelev, $message)
 {
+	$comms = new Comms();
+	$msgs = $comms->getConfig(6);
+	$cnum = 0;
+	if($msgs != false) {
+		foreach($msgs as $key=>$val) {
+			if($key >= $cnum) $cnum = $key+1;
+		}
+	} else {
+		$msgs = array();
+	}
+	$msgs[$cnum]["timestamp"] = time();
+	$msgs[$cnum]["level"] = $messagelev;
+	$msgs[$cnum]["message"] = $message;
 	
+	$comms->putConfig($msgs, 6);
 }
 
 function CBFWMessageBuilder()
 {
-	echo "message";
+	// show only 10 messages on this page
+	$maxshow = 6;
+	
+	$comms = new Comms();
+	
+	$msgs = $comms->getConfig(6);
+	if($msgs != false) {
+		krsort($msgs);
+	}
+	$show = 0;
+	if(count($msgs) > 0) {
+		echo "<table>";
+		foreach($msgs as $key => $val) {
+			$datetime = strftime("%c", $val["timestamp"]);
+			$sev = $val["level"];
+			$message = $val["message"];
+			
+			$sevcolour = "#ddffdd";
+			switch($sev) {
+				case "1":
+					$sevcolour = "#ffaaaa";
+					break;
+				case "2":
+					$sevcolour = "#ffdddd";
+					break;
+				case "3":
+					$sevcolour = "#ffffdd";
+					break;
+				case "4":
+					$sevcolour = "#ddffdd";
+					break;
+				case "5":
+					$sevcolour = "#aaffaa";
+					break;
+				case "6":
+					$sevcolour = "#ccaaaa";
+					break;
+			}
+			
+			echo "<tr bgcolor=\"$sevcolour\"><td><i>$datetime</i></td><td>$message ($sev)</td></tr>";
+			$show++;
+			if($show >= $maxshow) break;
+		}
+		echo "</table>";
+	}
 }
 
 function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW", $bodyfunctiondata=null)
@@ -229,6 +301,8 @@ function cbfw_getLastSeen($ip, $data)
 
 function CBFWConfigStatus()
 {
+	global $WEB_ROOT_FS, $BASE_URL;
+	
 	$comms = new Comms();
 	
 	$conf0 = $comms->getConfig(0);
@@ -246,7 +320,7 @@ function CBFWConfigStatus()
 		$client = "Current";
 	} else {
 		$ch = $conf2["status"];
-		$client = "$ch Changes";
+		$client = "$ch Changes <a href=\"$BASE_URL/changes/show\">Show</a>";
 	}