X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Fweb.php;h=87e7bf46854b638e92e9a194eb357f183a15ba33;hp=e9c319c2c1c87816a0bd54920a4d9af92371ab47;hb=c184472f1c4206a3bcd76ff8e9d27dc2eb1a4c4c;hpb=17073c349ed870962fddc2789a323c6dbc3dbd26
diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index e9c319c..87e7bf4 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");
@@ -24,10 +26,18 @@ class CBFWWeb {
$bodycontent = null;
$conf = new Config();
- $conf->loadConfig();
+ $comms = new Comms();
+ $conf->loadConfig($comms->getConfig(0));
$rconfig = $conf->getConfig();
- if($rconfig["status"] != "conf") cbfw_startinstaller();
+ if($rconfig["status"] != "conf") {
+ if($rconfig["status"] == "nodir") {
+ cbfw_startnodir();
+ return 0;
+ }
+ cbfw_startinstaller();
+ return 0;
+ }
if(isset($_REQUEST["q"])) {
@@ -36,12 +46,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";
@@ -49,16 +60,25 @@ class CBFWWeb {
case "rules":
$bodyFunction = "CBFWRulesPage";
break;
+ case "admin":
+ $bodyFunction = "CBFWAdminPage";
+ break;
default:
$bodyFunction = findUrl($url_s);
}
} else {
$bodyFunction = "CBFBuildHomePage";
}
- CBFWpageBuilder(null, $bodyFunction);
+ if($bodyFunction != null) 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
";
@@ -109,7 +129,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;
@@ -168,9 +188,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 "";
@@ -277,5 +297,15 @@ Now, tell me where you want me to create the webconfig file:
+
+