get the installer to run...

[CBFWR.git] / libcbfwr / web.php

diff --git a/libcbfwr/web.php b/libcbfwr/web.php
index aa039a8..6bfcad6 100644 (file)
--- a/libcbfwr/web.php
+++ b/libcbfwr/web.php
@@ -7,6 +7,8 @@ $MENU_ITEMS["30_Rules"]["link"] = "$BASE_URL/rules";
 $MENU_ITEMS["30_Rules"]["name"] = "Rules"; 
 $MENU_ITEMS["10_Interfaces"]["link"] = "$BASE_URL/interfaces"; 
 $MENU_ITEMS["10_Interfaces"]["name"] = "Interfaces"; 
+$MENU_ITEMS["05_Admin"]["link"] = "$BASE_URL/admin"; 
+$MENU_ITEMS["05_Admin"]["name"] = "Admin"; 
 
 // if i believed in name spacing in php, i'd use it.
 error_log("cbfwweb loaded");
@@ -22,6 +24,17 @@ class CBFWWeb {
        {
                $url = "/";
                $bodycontent = null;
+               
+               $conf = new Config();
+               $conf->loadConfig();
+               $rconfig = $conf->getConfig();
+               
+               if($rconfig["status"] != "conf") {
+                       cbfw_startinstaller();
+                       return 0;
+               }
+               
+               
                if(isset($_REQUEST["q"])) {
                        $url = $_REQUEST["q"];
                        
@@ -41,6 +54,9 @@ class CBFWWeb {
                                case "rules":
                                        $bodyFunction = "CBFWRulesPage";
                                        break;
+                               case "admin":
+                                       $bodyFunction = "CBFWAdminPage";
+                                       break;
                                default:
                                        $bodyFunction = findUrl($url_s);
                        }
@@ -51,6 +67,12 @@ 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>";
@@ -213,45 +235,6 @@ function cbfw_tdiffToAgo($time_in_sec)
        return $last;
 }
 
-function cbfw_isRemoteDir($url)
-{
-       file_get_contents($url);
-       //error_log("did file_get_contents on $url");
-       foreach($http_response_header as $key => $val) {
-               //error_log("got header of $key for $val");
-               if(preg_match("/.*Location:.*/", $val)) {
-                       //error_log("in details apt got location as $val from $url");
-                       $realloc = preg_replace("/.*: /", "", $val);
-                       $urlwithslash = $url."/";
-                       //echo "<br>in comp with<br>$urlwithslash<br>$realloc<br>";
-                       if(strcasecmp($realloc,$urlwithslash)==0) {
-                               //error_log("I believe $realloc is a directory redir for $url");
-                               return true;
-                       } else {
-                               //error_log("I dont believe $realloc is a directory redir for $url");
-                       }
-               }
-       }
-       return false;
-}
-
-function cbfw_fileExists($url)
-{
-       $fp = fopen($url, "r");
-       //error_og("did file_get_contents on $url");
-       $retval = false;
-       foreach($http_response_header as $key => $val) {
-               //error_log("got header of $key for $val");
-               if(preg_match("/.*HTTP\/.*200.*/", $val)) {
-                       //echo "is true\n";
-                       
-                       $retval = true;
-               }
-       }
-       fclose($fp);
-       return $retval;
-}
-
 function cbfw_startInstaller()
 {
        global $WEB_ROOT_FS, $BASE_URL;