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

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index 8e4967c..6bfcad6 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -1,12 +1,14 @@
 <?php
-$MENU_ITEMS["Zones"]["link"] = "$BASE_URL/zones"; 
-$MENU_ITEMS["Zones"]["name"] = "Zones"; 
-$MENU_ITEMS["Interfaces"]["link"] = "$BASE_URL/interfaces"; 
-$MENU_ITEMS["Interfaces"]["name"] = "Interfaces"; 
-$MENU_ITEMS["Objects"]["link"] = "$BASE_URL/objects"; 
-$MENU_ITEMS["Objects"]["name"] = "Objects"; 
-$MENU_ITEMS["Rules"]["link"] = "$BASE_URL/rules"; 
-$MENU_ITEMS["Rules"]["name"] = "Rules"; 
+$MENU_ITEMS["15_Zones"]["link"] = "$BASE_URL/zones"; 
+$MENU_ITEMS["15_Zones"]["name"] = "Zones"; 
+$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["10_Interfaces"]["link"] = "$BASE_URL/interfaces"; 
+$MENU_ITEMS["10_Interfaces"]["name"] = "Interfaces"; 
+$MENU_ITEMS["05_Admin"]["link"] = "$BASE_URL/admin"; 
+$MENU_ITEMS["05_Admin"]["name"] = "Admin"; 
 
 // if i believed in name spacing in php, i'd use it.
 error_log("cbfwweb loaded");
@@ -22,6 +24,17 @@ class CBFWWeb {
 	{
 		$url = "/";
 		$bodycontent = null;
+		
+		$conf = new Config();
+		$conf->loadConfig();
+		$rconfig = $conf->getConfig();
+		
+		if($rconfig["status"] != "conf") {
+			cbfw_startinstaller();
+			return 0;
+		}
+		
+		
 		if(isset($_REQUEST["q"])) {
 			$url = $_REQUEST["q"];
 			
@@ -30,25 +43,51 @@ class CBFWWeb {
 			
 			switch($url_s[0]) {
 				case "zones":
-					$bodycontent = CBFWZonesPage($url_s);
+					$bodyFunction = "CBFWZonesPage";
 					break;
 				case "interfaces":
-					$bodycontent = CBFWInterfacesPage($url_s);
+					$bodyFunction = "CBFWInterfacesPage";
 					break;
 				case "objects":
-					$bodycontent = CBFWObjectsPage($url_s);
+					$bodyFunction = "CBFWObjectsPage";
 					break;
 				case "rules":
-					$bodycontent = CBFWRulesPage($url_s);
+					$bodyFunction = "CBFWRulesPage";
+					break;
+				case "admin":
+					$bodyFunction = "CBFWAdminPage";
 					break;
 				default:
-					$bodycontent = findUrl($url_s);
+					$bodyFunction = findUrl($url_s);
 			}
+		} else {
+			$bodyFunction = "CBFBuildHomePage";
 		}
-		CBFWpageBuilder(null, null, $bodycontent);
+		CBFWpageBuilder(null, $bodyFunction);
 	}	
 }
 
+
+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>";
+	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();
+	
+	echo "<pre>";
+	print_r($conf->getConfig());
+	echo "\n\n\n";
+	print_r($conf->getBootConfig());
+	echo "</pre>";
+	
+}
+
 function CBFWMenuBuilder()
 {
 	global $BASE_URL, $MENU_ITEMS;
@@ -196,45 +235,6 @@ function cbfw_tdiffToAgo($time_in_sec)
 	return $last;
 }
 
-function cbfw_isRemoteDir($url)
-{
-	file_get_contents($url);
-	//error_log("did file_get_contents on $url");
-	foreach($http_response_header as $key => $val) {
-		//error_log("got header of $key for $val");
-		if(preg_match("/.*Location:.*/", $val)) {
-			//error_log("in details apt got location as $val from $url");
-			$realloc = preg_replace("/.*: /", "", $val);
-			$urlwithslash = $url."/";
-			//echo "<br>in comp with<br>$urlwithslash<br>$realloc<br>";
-			if(strcasecmp($realloc,$urlwithslash)==0) {
-				//error_log("I believe $realloc is a directory redir for $url");
-				return true;
-			} else {
-				//error_log("I dont believe $realloc is a directory redir for $url");
-			}
-		}
-	}
-	return false;
-}
-
-function cbfw_fileExists($url)
-{
-	$fp = fopen($url, "r");
-	//error_og("did file_get_contents on $url");
-	$retval = false;
-	foreach($http_response_header as $key => $val) {
-		//error_log("got header of $key for $val");
-		if(preg_match("/.*HTTP\/.*200.*/", $val)) {
-			//echo "is true\n";
-			
-			$retval = true;
-		}
-	}
-	fclose($fp);
-	return $retval;
-}
-
 function cbfw_startInstaller()
 {
 	global $WEB_ROOT_FS, $BASE_URL;