X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_web.php;h=e7e0e54dcad6a744916c0b4a76e3d57ec97af04f;hp=72f95d7819e5787bcb40394e95abd86ceb67f90b;hb=979dc6190296b0c7ffdfe17031f2d32318da7e2b;hpb=4d6a42b605b8c52c5621fb704b284e4c12672755

diff --git a/gwvpmini/gwvpmini_web.php b/gwvpmini/gwvpmini_web.php
index 72f95d7..e7e0e54 100644
--- a/gwvpmini/gwvpmini_web.php
+++ b/gwvpmini/gwvpmini_web.php
@@ -13,7 +13,7 @@ $MENU_ITEMS["00home"]["link"] = "$BASE_URL";
 
 function gwvpmini_goWeb()
 {
-	global $CALL_ME_FUNCTIONS;
+	global $CALL_ME_FUNCTIONS, $force_ssl;
 	
 	// first we determine if we have a valid setup and run the installer if not
 	/*if(!gwvpmini_issetup()) {
@@ -24,9 +24,18 @@ function gwvpmini_goWeb()
 	// next, we go thru the CALL_ME_FUNCTIONS - the purpose of call_me_functions is to determine if a function should be called based on
 	// the functions return (i.e. if function returns false, its not it, otherwise it returns a function name we have to call)
 	// this is important for our plugin structure later on - the key on the array serves an an ordering method
+	
+	if($force_ssl) {
+		if(!isset($_SERVER['HTTPS'])) {
+			header("Location: https://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"], true);
+			return;
+		}	
+	}
+	
+	
 	ksort($CALL_ME_FUNCTIONS);
 	foreach($CALL_ME_FUNCTIONS as $key => $val) {
-		error_log("checking callmefunction $key as $val");
+		//error_log("checking callmefunction $key as $val");
 		$callme = $val();
 		if($callme !== false) {
 			$callme();
@@ -90,6 +99,11 @@ function gwvpmini_goMainPage($bodyFunction = null)
 	
 	
 	echo "<table width=\"100%\">";
+	
+	echo "<tr width=\"100%\" bgcolor=\"#ddddff\"><td colspan=\"2\" align=\"right\">";
+	gwvpmini_SearchBuilder();
+	echo "</td></tr>";
+	
 
 	if(isset($_SESSION["message"])) {
 		echo "<tr width=\"100%\"><td colspan=\"2\">";
@@ -105,7 +119,7 @@ function gwvpmini_goMainPage($bodyFunction = null)
 	
 	echo "</tr>";
 	
-	echo "<tr><td>";
+	echo "<tr><td colspan=\"2\">";
 	if($bodyFunction == null) {
 		gwvpmini_BodyBuilder();
 	} else {
@@ -197,7 +211,7 @@ function gwvpmini_LoginBuilder()
 	if($login === false) {
 		gwvpmini_SingleLineLoginForm();
 	} else {
-		echo "Hello ".$_SESSION["fullname"]." <a href=\"$BASE_URL/logout\">logout</a>";
+		echo "Hello <a href=\"$BASE_URL/user/".$_SESSION["username"]."\">".$_SESSION["fullname"]."</a> <a href=\"$BASE_URL/logout\">logout</a>";
 	}
 }
 
@@ -219,21 +233,74 @@ function gwvpmini_BodyBuilder()
 // builds the tail structure
 function gwvpmini_TailBuilder()
 {
-	echo "<font size=\"-1\"><i>Copyright 2011, PJR - licensed under GPL</i></font>";
+	echo "<br><br><hr><font size=\"-1\"><b><a href=\"http://github.com/takigama/GWVP\">GWVP</a></b> - <i>Copyright 2011, 2012 PJR - <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a></i></font>";
+}
+
+function gwvpmini_emailToUserLink($email)
+{
+	global $BASE_URL;
+	
+	$username = gwvpmini_GetUserNameFromEmail($email);
+	
+	if($username !== false) {
+		return "<a href=\"$BASE_URL/user/$username\">$username</a>";
+	} else {
+		return false;
+	}
 }
 
 function gwvpmini_fourZeroThree()
 {
 	error_log("403 called");
-	header("HTTP/1.0 403 Permission Denied");
+	header("HTTP/1.1 403 Permission Denied");
 }
 
 function gwvpmini_fourZeroFour()
 {
 	error_log("404 called");
-	header("HTTP/1.0 404 No Such Thing");
+	header("HTTP/1.1 404 No Such Thing");
 }
 
 
+/**
+ * Get either a Gravatar URL or complete image tag for a specified email address.
+ *
+ * @param string $email The email address
+ * @param string $s Size in pixels, defaults to 80px [ 1 - 2048 ]
+ * @param string $d Default imageset to use [ 404 | mm | identicon | monsterid | wavatar ]
+ * @param string $r Maximum rating (inclusive) [ g | pg | r | x ]
+ * @param boole $img True to return a complete IMG tag False for just the URL
+ * @param array $atts Optional, additional key/value attributes to include in the IMG tag
+ * @return String containing either just a URL or a complete image tag
+ * @source http://gravatar.com/site/implement/images/php/
+ */
+function gwvpmini_HtmlGravatar($email, $size, $htmlappend="")
+{
+	
+	global $use_gravatar;
+	
+	if($use_gravatar) {
+		error_log("call to gravatar with yes");
+	} else {
+		error_log("call to gravatar with no");
+	}
+	
+	if($use_gravatar == false) return "";
+	return get_gravatar( $email, $size, 'mm', 'g', true)."$htmlappend";
+}
+
+function get_gravatar( $email, $s = 80, $d = 'mm', $r = 'g', $img = false, $atts = array() ) {
+	$url = 'http://en.gravatar.com/avatar/';
+	$url .= md5( strtolower( trim( $email ) ) );
+	$url .= "?s=$s&d=$d&r=$r";
+	if ( $img ) {
+		$url = '<img src="' . $url . '"';
+		foreach ( $atts as $key => $val )
+			$url .= ' ' . $key . '="' . $val . '"';
+		$url .= ' />';
+	}
+	return $url;
+}
+
 
 ?>
\ No newline at end of file