moving the configuration changes into the single config class

[CBFWR.git] / libcbfwr / web.php

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index 6baae23..6977dc6 100644 (file)
--- 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,11 +77,6 @@ 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<br>";
@@ -177,11 +175,11 @@ function CBFWpageBuilder($bodyClass, $bodyFunction, $bodycontent=null, $title="C
        
        // page top
        echo "<h1>CBFW</h1><br>";
-       echo "<table><tr width=\"100%\"><td>";
+       echo "<table width=\"100%\"><tr width=\"100%\"><td>";
        CBFWMessageBuilder();
-       echo "<td><td><align=\"right\">";
+       echo "<td><td align=\"right\">";
        CBFWConfigStatus();
-       echo "</align></td></tr><tr><td>";
+       echo "</td></tr><tr><td>";
        
        // menu, then body
        echo "<table><tr><td>";
@@ -234,6 +232,8 @@ function cbfw_getLastSeen($ip, $data)
 
 function CBFWConfigStatus()
 {
+       global $WEB_ROOT_FS, $BASE_URL;
+       
        $comms = new Comms();
        
        $conf0 = $comms->getConfig(0);
@@ -251,7 +251,7 @@ function CBFWConfigStatus()
                $client = "Current";
        } else {
                $ch = $conf2["status"];
-               $client = "$ch Changes";
+               $client = "$ch Changes <a href=\"$BASE_URL/changes/show\">Show</a>";
        }