if(isset($urls[1])) {
switch($urls[1]) {
+ case "modify":
+
+ if($_REQUEST["description"] != "") $desc = $_REQUEST["description"];
+ else $desc = null;
+
+ $oldname = $_REQUEST["oldname"];
+ $newname = $_REQUEST["zonename"];
+
+ $renewname = null;
+ error_log("comparing \"$oldname\" to \"$newname\"");
+ if($oldname != $newname) {
+ $renewname = " rename $newname";
+ }
+
+ $oldconf = getWebUserConfig();
+ $olddesc = $oldconf["zone"][$oldname]["description"];
+ error_log("Comparing \"$olddesc\" and \"$desc\"");
+ if($desc != $olddesc) {
+ $newdesc = " # $desc";
+ } else $newdesc = null;
+
+ //echo "confs: \"$olddesc\", \"$newdesc\", $oldname, $newname<br>";
+ //exit(0);
+
+ if($renewname == null && $newdesc == null) {
+ header("Location: $BASE_URL/zones");
+ error_log("no changes?");
+ return;
+ }
+
+
+ $conf = $comms->getConfig(3);
+ $changes = $conf["status"];
+ if($changes == "nochange") $conf["status"] = 1;
+ else $conf["status"] = $changes + 1;
+ $cnum = $conf["status"];
+
+ $conf[$cnum]["modify"] = "zone $oldname$renewname$newdesc";
+ $comms->putConfig($conf, 3);
+ header("Location: $BASE_URL/zones");
+
+ break;
+
+
case "edit":
+ CBFWpageBuilder(null, "CBFWZonesEditPage", null, null, $urls);
break;
- case "change":
+
+
+ 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);
+ header("Location: $BASE_URL/zones");
break;
+
+
case "add":
+
+ // UGLY
+ $cnum = 0;
$nametoadd = $_REQUEST["toadd"];
- $comms->sendMessage("zone add $nametoadd");
- //if($_REQUEST["desc"] != "") $comms->sendMessage("zone ")
+ $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);
header("Location: $BASE_URL/zones");
break;
+
+
default:
CBFWpageBuilder(null, "CBFWZonesPageDisplay");
}
}
}
-function CBFWZonesPageDisplay()
+function CBFWZonesEditPage($urls)
{
global $BASE_URL, $MENU_ITEMS;
+ $zone = $urls[2];
+
+ $config = getWebUserConfig();
+
+
+ echo "<h2>Edit Zone $zone</h2>";
+ echo "<form method=\"post\" action=\"$BASE_URL/zones/modify/$zone\">";
+ echo "<input type=\"hidden\" name=\"oldname\" value=\"$zone\">";
+ echo "Name: <input type=\"text\" name=\"zonename\" value=\"$zone\"><br>";
+
+ if(isset($config["zone"][$zone]["description"])) $desc = $config["zone"][$zone]["description"];
+
+ echo "Description: <input type=\"text\" name=\"description\" value=\"$desc\"><br>";
+ echo "<input type=\"submit\" name=\"Go\" value=\"Go\">";
+ echo "</form>";
+}
+
+function getWebUserConfig()
+{
$comms = new Comms();
+ $myconf = new Config();
- $config = $comms->getConfig();
+
+ // check to see if pre-cache config matches change level of config change buffer
+ $config = $comms->getConfig(5);
+ $conf2 = $comms->getConfig(3);
+ if(isset($config["status"])) {
+ if($config["status"] == $conf2["status"]) {
+ // it did, return the pre-cache
+ error_log("got pre-cache config");
+ return $config;
+ }
+ }
+
+ // it did not, do a new merge and cache
+ $config = $myconf->mergeConfig($comms->getConfig(), $conf2);
+ $reconfig = $config;
+ $reconfig["status"] = $conf2["status"];
+ error_log("put pre-cache config");
+ $comms->putConfig($reconfig, 5);
+
+ return $config;
+}
+
+function CBFWZonesPageDisplay()
+{
+ global $BASE_URL, $MENU_ITEMS;
+
+ $config = getWebUserConfig();
echo "<h2>Zones</h2>";
- echo "<table border=\"1\"><tr><th>Zone</th><th>Interfaces</th><th>Edit</th></tr>";
+ echo "<table border=\"1\"><tr><th>Zone</th><th>Interfaces</th><th>Description</th><th>Edit</th></tr>";
foreach($config["zone"] as $key => $var) {
$name = $key;
$url = "<a href=\"$BASE_URL/zones/edit/$name\">Edit</a>";
- echo "<tr><td>$name</td><td>...</td><td>$url</td></tr>";
+ $url2 = "<a href=\"$BASE_URL/zones/delete/$name\">Delete</a>";
+ $desc = $var["description"];
+ echo "<tr><td>$name</td><td>...</td><td>$desc</td><td>$url $url2</td></tr>";
}
echo "</table><br>";
// hw address
if(isset($val["hwaddress"])) $table[$key]["hwaddress"] = $val["hwaddress"];
+
+ // current mtu
+ if(isset($val["mtu"])) $table[$key]["mtu"] = $val["mtu"];
}
foreach($config["hardware"]["netdev"] as $key=>$val) {