force ssl, change to /gwvp url

[gwvp-mini.git] / gwvpmini / gwvpmini_web.php

diff --git a/gwvpmini/gwvpmini_web.php b/gwvpmini/gwvpmini_web.php
index f6b6665..e7e0e54 100644 (file)
--- 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();
@@ -202,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>";
        }
 }
 
@@ -224,34 +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($username);
+       $username = gwvpmini_GetUserNameFromEmail($email);
        
        if($username !== false) {
                return "<a href=\"$BASE_URL/user/$username\">$username</a>";
        } else {
-               return "Uknown";
+               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");
 }
 
 
+/**\r
+ * Get either a Gravatar URL or complete image tag for a specified email address.\r
+ *\r
+ * @param string $email The email address\r
+ * @param string $s Size in pixels, defaults to 80px [ 1 - 2048 ]\r
+ * @param string $d Default imageset to use [ 404 | mm | identicon | monsterid | wavatar ]\r
+ * @param string $r Maximum rating (inclusive) [ g | pg | r | x ]\r
+ * @param boole $img True to return a complete IMG tag False for just the URL\r
+ * @param array $atts Optional, additional key/value attributes to include in the IMG tag\r
+ * @return String containing either just a URL or a complete image tag\r
+ * @source http://gravatar.com/site/implement/images/php/\r
+ */
+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";
+}
+\r
+function get_gravatar( $email, $s = 80, $d = 'mm', $r = 'g', $img = false, $atts = array() ) {\r
+       $url = 'http://en.gravatar.com/avatar/';\r
+       $url .= md5( strtolower( trim( $email ) ) );\r
+       $url .= "?s=$s&d=$d&r=$r";\r
+       if ( $img ) {\r
+               $url = '<img src="' . $url . '"';\r
+               foreach ( $atts as $key => $val )\r
+                       $url .= ' ' . $key . '="' . $val . '"';\r
+               $url .= ' />';\r
+       }\r
+       return $url;\r
+}\r
+
 
 ?>
\ No newline at end of file