X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Fweb.php;h=6977dc659685b3f9247082556172eda5ebfba151;hp=87e7bf46854b638e92e9a194eb357f183a15ba33;hb=b571fcf2648a6d5a4893125cb97db4f3f73ee134;hpb=c184472f1c4206a3bcd76ff8e9d27dc2eb1a4c4c
diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index 87e7bf4..6977dc6 100644
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -55,13 +55,16 @@ class CBFWWeb {
CBFWInterfacesPage($url_s);
break;
case "objects":
- $bodyFunction = "CBFWObjectsPage";
+ CBFWObjectsPage($url_s);
break;
case "rules":
$bodyFunction = "CBFWRulesPage";
break;
+ case "changes":
+ CBFWChangesPage($url_s);
+ break;
case "admin":
- $bodyFunction = "CBFWAdminPage";
+ CBFWAdminPage($url_s);
break;
default:
$bodyFunction = findUrl($url_s);
@@ -74,22 +77,21 @@ 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
";
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 "
";
}
@@ -126,7 +128,7 @@ function CBFWAddMessage($messagelev, $message)
function CBFWMessageBuilder()
{
-
+ echo "message";
}
function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="CBFW", $bodyfunctiondata=null)
@@ -173,9 +175,11 @@ function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="C
// page top
echo "CBFW
";
- echo "";
+ echo "";
CBFWMessageBuilder();
- echo " | | ";
+ echo " | | ";
+ CBFWConfigStatus();
+ echo " | ";
// menu, then body
echo "";
@@ -226,6 +230,36 @@ function cbfw_getLastSeen($ip, $data)
}
+function CBFWConfigStatus()
+{
+ global $WEB_ROOT_FS, $BASE_URL;
+
+ $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 Show";
+ }
+
+
+ echo "Saved Config: $saved ";
+ echo "Running Config: $running ";
+ echo "Client Config: $client ";
+}
+
function cbfw_tdiffToAgo($time_in_sec)
{
$tdiff = $time_in_sec;
|
|
|