X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Ffwui.php;h=63c6613b7530d6b285f391d152a7ef9d93d2e439;hp=4bcfed5513ae07cc14624e34daac0a8e76ef4963;hb=b571fcf2648a6d5a4893125cb97db4f3f73ee134;hpb=c6a0d901040bc483d89d8596661dcf0d5a48ffb2 diff --git a/libcbfwr/fwui.php b/libcbfwr/fwui.php index 4bcfed5..63c6613 100644 --- a/libcbfwr/fwui.php +++ b/libcbfwr/fwui.php @@ -58,15 +58,8 @@ function CBFWZonesPage($urls) case "delete": $zonetodelete = $urls[2]; - - $conf = $comms->getConfig(3); - $changes = $conf["status"]; - if($changes == "nochange") $conf["status"] = 1; - else $conf["status"] = $changes + 1; - $cnum = $conf["status"]; - - $conf[$cnum]["delete"] = "zone $zonetodelete"; - $comms->putConfig($conf, 3); + + addWebUserChange("delete zone name $zonetodelete"); header("Location: $BASE_URL/zones"); break; @@ -74,21 +67,16 @@ function CBFWZonesPage($urls) case "add": // UGLY - $cnum = 0; $nametoadd = $_REQUEST["toadd"]; $desc = $_REQUEST["desc"]; + $descbit = ""; if($desc != "") $descbit = " # $desc"; if($nametoadd == "" || $nametoadd == null) { return; } - $conf = $comms->getConfig(3); - $changes = $conf["status"]; - if($changes == "nochange") $conf["status"] = 1; - else $conf["status"] = $changes + 1; - $cnum = $conf["status"]; - $conf[$cnum]["add"] = "zone $nametoadd$descbit"; - $comms->putConfig($conf, 3); + + addWebUserChange("zone name $nametoadd $descbit"); header("Location: $BASE_URL/zones"); break; @@ -122,6 +110,28 @@ function CBFWZonesEditPage($urls) echo ""; } +function addWebUserChange($change) +{ + $comms = new Comms(); + $myconf = new Config(); + + $conf = $comms->getConfig(3); + + if(!isset($conf["status"])) { + $conf["status"] = "nochange"; + } + + $changes = $conf["status"]; + if($changes == "nochange") $conf["status"] = 1; + else $conf["status"] = $changes + 1; + $cnum = $conf["status"]; + + $conf["changes"][$cnum] = "$change"; + $comms->putConfig($conf, 3); + +} + +// TODO: we need to really sit and think about this one function getWebUserConfig() { $comms = new Comms(); @@ -140,13 +150,20 @@ function getWebUserConfig() } // it did not, do a new merge and cache - $config = $myconf->mergeConfig($comms->getConfig(), $conf2); + // TODO: need to do this part + $config = $comms->getConfig(); $reconfig = $config; + $myconf->setConfig($config); + if(isset($conf2["changes"])) foreach($conf2["changes"] as $key => $var) { + error_log("Adding config line $key, $var"); + $myconf->addConfigLine($var); + } + $reconfig = $myconf->getConfig(); $reconfig["status"] = $conf2["status"]; error_log("put pre-cache config"); $comms->putConfig($reconfig, 5); - return $config; + return $reconfig; } function CBFWZonesPageDisplay() @@ -334,11 +351,123 @@ function CBFWInterfacesPageDisplay() echo ""; } -function CBFWObjectsPage() +function CBFWObjectsPage($urls) { $comms = new Comms(); $config = $comms->getConfig(); + + CBFWpageBuilder(null, "CBFWObjectsDisplay"); +} + +function CBFWObjectsDisplay() +{ + global $BASE_URL, $MENU_ITEMS; + $config = getWebUserConfig(); + + echo "
Networks | Hosts | Services | Network Groups | Host Groups | Service Groups |
---|
";
+ echo "Create Network"; + echo ""; + echo " | ";
+ echo "";
+ echo "Create Host"; + echo ""; + echo " | ";
+ echo "";
+ echo "Service"; + echo ""; + echo " | ";
+ echo "
";
+ echo "Network Group"; + echo ""; + echo " | ";
+ echo "";
+ echo "Host Group"; + echo ""; + echo " | ";
+ echo "";
+ echo "Service Group"; + echo ""; + echo " | ";
+
+
+ echo "
Change No | Change | Control |
---|---|---|
$key | $var | Delete |
+Users+
+ Add User+ + |
+
+Network Access+
+ Add Access+ + |
+