Changeset 23187

Timestamp:

Jun 13, 2013, 8:41:32 PM (11 years ago)

Author:

rvelices

Message:

nicer urls when used over https

File:

• trunk/include/functions_url.inc.php (modified) (2 diffs)

trunk/include/functions_url.inc.php

@@ -52 +52 @@
   if ($with_scheme)
   {
+    $is_https = false;
     if (isset($_SERVER['HTTPS']) &&
-        ((strtolower($_SERVER['HTTPS']) == 'on') or ($_SERVER['HTTPS'] == 1)))
-    {
+      ((strtolower($_SERVER['HTTPS']) == 'on') or ($_SERVER['HTTPS'] == 1)))
+    {
+      $is_https = true;
       $url .= 'https://';
     }
@@ -62 +64 @@
     }
     $url .= $_SERVER['HTTP_HOST'];
-    if ($_SERVER['SERVER_PORT'] != 80)
+    if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80)
+          ||($is_https && $_SERVER['SERVER_PORT'] != 443))
     {
       $url_port = ':'.$_SERVER['SERVER_PORT'];