moving the configuration changes into the single config class
[CBFWR.git] / libcbfwr / fwui.php
index e827c2c..63c6613 100644 (file)
@@ -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 "</form>";
 }
 
+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()
@@ -414,6 +431,45 @@ function CBFWObjectsDisplay()
        
 }
 
+function CBFWChangesPage($urls)
+{
+       global $BASE_URL, $MENU_ITEMS;
+       
+       if(isset($urls[1])) {
+               switch($urls[1]) {
+                       case "show":
+                               CBFWpageBuilder(null, "CBFWChangesDisplay");
+                               break;
+                       case "delete":
+                               $delete = $urls[2];
+                               error_log("would delete change $delete");
+                               header("Location: $BASE_URL/changes/show");
+                               break;
+               }
+       }
+}
+
+function CBFWChangesDisplay()
+{
+       global $BASE_URL, $MENU_ITEMS;
+       $comms = new Comms();
+       
+       $config = $comms->getConfig(3);
+       
+       echo "<h2>Changes</h2>";
+       echo "This page shows the changes on the web from the currently running configuration<br>";
+       if($config["status"] == "nochange") {
+               echo "There are currently no changes from the running configuraiton.";
+       } else {
+               echo "<table border=\"1\">";
+               echo "<tr><th>Change No</th><th>Change</th><th>Control</th></tr>";
+               foreach($config["changes"] as $key => $var) {
+                       echo "<tr><td>$key</td><td>$var</td><td><a href=\"$BASE_URL/changes/delete/$key\">Delete</a></td></tr>";
+               }
+               echo "</table>";
+       }
+}
+
 function CBFWRulesPage()
 {
        $comms = new Comms();