fixed this_url() for https

diff --git a/http.php b/http.php
index 042e1b9..1fad97b 100644 (file)
--- a/http.php
+++ b/http.php
@@ -21,15 +21,12 @@
 
 # return our best guess at the url used to access this page, without the path or query string
 function this_url_sans_path() {
-       list($protocol, $version) = explode('/', $_SERVER['SERVER_PROTOCOL']);
-       $url = strtolower($protocol);
-
-       if($url == 'http') {
-               $expected_port = 80;
-       } elseif ($url == 'https') {
+       if(strtolower($_SERVER['HTTPS']) == 'on' || strtolower($_SERVER['HTTPS']) == 'yes') {
+               $url = 'https';
                $expected_port = 443;
        } else {
-               $expected_port = -1;
+               $url = 'http';
+               $expected_port = 80;
        }
 
        $url .= '://';