X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Fweb.php;h=66e7cdf23d2a481d8a3508bf2be6eff19ae11716;hp=6bfcad6ed1e526f8a55fb49f046725aba6301f86;hb=0f5458e4a9c18595f7d9501880011369e4e65942;hpb=474b0153b49ab3d9fb50d09034cae23373c6dc72

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index 6bfcad6..66e7cdf 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -41,12 +41,13 @@ class CBFWWeb {
 			// ok, now we try and find the basics
 			$url_s = explode("/", $url);
 			
+			$bodyFunction = null;
 			switch($url_s[0]) {
 				case "zones":
-					$bodyFunction = "CBFWZonesPage";
+					CBFWZonesPage($url_s);
 					break;
 				case "interfaces":
-					$bodyFunction = "CBFWInterfacesPage";
+					CBFWInterfacesPage($url_s);
 					break;
 				case "objects":
 					$bodyFunction = "CBFWObjectsPage";
@@ -63,7 +64,7 @@ class CBFWWeb {
 		} else {
 			$bodyFunction = "CBFBuildHomePage";
 		}
-		CBFWpageBuilder(null, $bodyFunction);
+		if($bodyFunction != null) CBFWpageBuilder(null, $bodyFunction);
 	}	
 }
 
@@ -123,7 +124,7 @@ function CBFWMessageBuilder()
 
 }
 
-function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW")
+function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW", $bodyfunctiondata=null)
 {
 	global $WEB_ROOT_FS, $BASE_URL;
 	
@@ -182,9 +183,9 @@ function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="C
 	}
 	
 	if($bodyClass != null) {
-		$bodyClass->$bodyFunction($url);
+		$bodyClass->$bodyFunction($bodyfunctiondata);
 	} else if( $bodyFunction != null) {
-		$bodyFunction($url);
+		$bodyFunction($bodyfunctiondata);
 	} else echo $bodycontent;
 	echo "</td></tr></table>";