From: paulr <me@pjr.cc>
Date: Tue, 20 Sep 2011 18:09:02 +0000 (+1000)
Subject: get the installer to run...
X-Git-Url: http://git.pjr.cc/?a=commitdiff_plain;h=474b0153b49ab3d9fb50d09034cae23373c6dc72;p=CBFWR.git

get the installer to run...
---

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index e9c319c..6bfcad6 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -7,6 +7,8 @@ $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");
@@ -27,7 +29,10 @@ class CBFWWeb {
 		$conf->loadConfig();
 		$rconfig = $conf->getConfig();
 		
-		if($rconfig["status"] != "conf") cbfw_startinstaller();
+		if($rconfig["status"] != "conf") {
+			cbfw_startinstaller();
+			return 0;
+		}
 		
 		
 		if(isset($_REQUEST["q"])) {
@@ -49,6 +54,9 @@ class CBFWWeb {
 				case "rules":
 					$bodyFunction = "CBFWRulesPage";
 					break;
+				case "admin":
+					$bodyFunction = "CBFWAdminPage";
+					break;
 				default:
 					$bodyFunction = findUrl($url_s);
 			}
@@ -59,6 +67,12 @@ 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>";