X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvpweb.php;h=3cc931c052cfc616cbf0635277ef43cd0db284dc;hp=c88e302163e08bf66501b041bef039bbb45d7d06;hb=507bc8f2818a42d751ed6e2e2fc68ee2bde94016;hpb=5d5e0ef454ba3bb0ce2eafd5612ab5f91c4e0d99

diff --git a/gwvplib/gwvpweb.php b/gwvplib/gwvpweb.php
index c88e302..3cc931c 100644
--- a/gwvplib/gwvpweb.php
+++ b/gwvplib/gwvpweb.php
@@ -3,6 +3,9 @@
 // this function is the initial insertion point for the web calls, here we need to determine where we go
 global $CALL_ME_FUNCTIONS;
 
+// the home_page_provders bit is an array 
+global $HOME_PAGE_PROVIDERS;
+
 $MENU_ITEMS["00home"]["text"] = "Home";
 $MENU_ITEMS["00home"]["link"] = "$BASE_URL";
 
@@ -151,17 +154,28 @@ function gwvp_MenuBuilder()
 	
 	ksort($MENU_ITEMS);
 	
+	echo "\n\n\n";
 	echo "<table border=\"1\"><tr><td><b><i>Menu</i></b></td>";
 	foreach($MENU_ITEMS as $key => $val) {
 		$link = $val["link"];
 		$text = $val["text"];
-		$q = "";
-		if(isset($_REQUEST["q"])) $q = $BASE_URL."/".$_REQUEST["q"];
-		else $q = $BASE_URL;
-		if($q == $link) $menucolor = " bgcolor=\"#ffdddd\"";
-		else $menucolor = "";
 		
-		error_log("checking $q against $link now $menucolor");
+		// TODO: redo this bit with stristr to find urls - special case for home
+		$menucolor = "";
+		if(isset($_REQUEST["q"])) {
+			$extlink = str_replace("$BASE_URL/", "", $link);
+			error_log("trying to do replace of $BASE_URL in $link, got $extlink for ".$_REQUEST["q"]);
+			if(stristr($_REQUEST["q"], $extlink)!==false) {
+				$menucolor = " bgcolor=\"#ffdddd\"";
+				
+			}
+		} else {
+			// special case for home
+			if($link == $BASE_URL) $menucolor = " bgcolor=\"#ffdddd\"";
+		}
+		
+		
+		
 		
 		if(isset($val["userlevel"])) {
 			if(gwvp_CheckAuthLevel($val["userlevel"])) {
@@ -173,6 +187,7 @@ function gwvp_MenuBuilder()
 		}
 	}
 	echo "</tr></table>";
+	echo "\n\n\n";
 	
 }
 
@@ -180,18 +195,29 @@ function gwvp_LoginBuilder()
 {
 	global $WEB_ROOT_FS, $BASE_URL;
 	
+	echo "\n\n\n";
 	$login = gwvp_IsLoggedIn();
 	if($login === false) {
 		gwvp_SingleLineLoginForm();
 	} else {
 		echo "Hello, ".gwvp_GetFullName($login)." <a href=\"$BASE_URL/logout\">logout</a>";
 	}
+	echo "\n\n\n";
 }
 
 // builds the body structure
 function gwvp_BodyBuilder()
 {
-	echo "I AM THE MAIN BODY, FEAR ME!!!!";
+	global $HOME_PAGE_PROVIDERS;
+	
+	echo "I AM THE MAIN BODY, FEAR ME!!!! - have no idea whats going to go here";
+	if(isset($HOME_PAGE_PROVIDERS)) {
+		ksort($HOME_PAGE_PROVIDERS);
+		foreach($HOME_PAGE_PROVIDERS as $provider) {
+			error_log("Loading home_page_provider, $provider");
+			$provider();
+		}
+	}
 }
 
 // builds the tail structure
@@ -200,4 +226,16 @@ function gwvp_TailBuilder()
 	echo "<font size=\"-1\"><i>Copyright 2011, PJR - licensed under GPL</i></font>";
 }
 
+function gwvp_fourZeroThree()
+{
+	header("HTTP/1.0 403 Permission Denied");
+}
+
+function gwvp_fourZeroFour()
+{
+	header("HTTP/1.0 404 No Such Thing");
+}
+
+
+
 ?>
\ No newline at end of file