X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Fweb.php;h=6baae23c14632b4884a1e170f439aec3ec9589f2;hp=6bfcad6ed1e526f8a55fb49f046725aba6301f86;hb=60673f4f00bab805471fcbb85c8816aebb3a9582;hpb=474b0153b49ab3d9fb50d09034cae23373c6dc72
diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index 6bfcad6..6baae23 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -26,10 +26,15 @@ class CBFWWeb {
$bodycontent = null;
$conf = new Config();
- $conf->loadConfig();
+ $comms = new Comms();
+ $conf->loadConfig($comms->getConfig(0));
$rconfig = $conf->getConfig();
if($rconfig["status"] != "conf") {
+ if($rconfig["status"] == "nodir") {
+ cbfw_startnodir();
+ return 0;
+ }
cbfw_startinstaller();
return 0;
}
@@ -41,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";
@@ -63,7 +69,7 @@ class CBFWWeb {
} else {
$bodyFunction = "CBFBuildHomePage";
}
- CBFWpageBuilder(null, $bodyFunction);
+ if($bodyFunction != null) CBFWpageBuilder(null, $bodyFunction);
}
}
@@ -77,13 +83,17 @@ function CBFBuildHomePage($urls)
{
echo "Must remember this, gotta rules could apply to multiple zones not just one
";
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();
+
+ $comms = new Comms();
echo "
";
- print_r($conf->getConfig());
+ print_r($comms->getConfig(0));
+ echo "\n\n\n";
+ print_r($comms->getConfig(1));
echo "\n\n\n";
- print_r($conf->getBootConfig());
+ print_r($comms->getConfig(2));
+ echo "\n\n\n";
+ print_r($comms->getConfig(3));
echo "
";
}
@@ -120,10 +130,10 @@ function CBFWAddMessage($messagelev, $message)
function CBFWMessageBuilder()
{
-
+ echo "message";
}
-function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW")
+function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW", $bodyfunctiondata=null)
{
global $WEB_ROOT_FS, $BASE_URL;
@@ -167,9 +177,11 @@ function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="C
// page top
echo "CBFW
";
- echo "";
+ echo "";
CBFWMessageBuilder();
- echo " | | ";
+ echo " | | ";
+ CBFWConfigStatus();
+ echo " | ";
// menu, then body
echo "";
@@ -182,9 +194,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 " | ";
@@ -220,6 +232,34 @@ function cbfw_getLastSeen($ip, $data)
}
+function CBFWConfigStatus()
+{
+ $comms = new Comms();
+
+ $conf0 = $comms->getConfig(0);
+ $conf1 = $comms->getConfig(2);
+ $conf2 = $comms->getConfig(3);
+
+ if($conf1["status"] == "nochange") {
+ $saved = "Current";
+ $running = "Current";
+ } else {
+ $saved = "Old";
+ $running = "Current";
+ }
+ if($conf2["status"] == "nochange") {
+ $client = "Current";
+ } else {
+ $ch = $conf2["status"];
+ $client = "$ch Changes";
+ }
+
+
+ echo "Saved Config: $saved ";
+ echo "Running Config: $running ";
+ echo "Client Config: $client ";
+}
+
function cbfw_tdiffToAgo($time_in_sec)
{
$tdiff = $time_in_sec;
@@ -291,5 +331,15 @@ Now, tell me where you want me to create the webconfig file:
+
+Cant Run
+There is no config and no directory where i can store one. Login to the server and either create /var/run/cbfwr or /var
+
+
\ No newline at end of file
|
|