Changeset 623

Timestamp:

Feb 17, 2018 10:59:13 AM (6 years ago)

Author:

anonymous

Message:

Simplify HTTPS detection

Location:

trunk/lib

Files:

• App.inc.php (modified) (5 diffs)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -468 +468 @@
         // Not available on CLI scripts obviously.
         if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST'] && '' == $this->getParam('site_url')) {
-            $this->setParam(array('site_url' => sprintf('%s://%s', ('on' == getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'))));
+            $this->setParam(array('site_url' => sprintf('%s://%s', (getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'))));
         }
 
@@ -474 +474 @@
         // Also not available on CLI scripts obviously.
         if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST']) {
-            $this->setParam(array('page_url' => sprintf('%s://%s%s', ('on' == getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'), getenv('REQUEST_URI'))));
+            $this->setParam(array('page_url' => sprintf('%s://%s%s', (getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'), getenv('REQUEST_URI'))));
         }
 
@@ -1368 +1368 @@
         if (preg_match('!^/!', $url)) {
             // If relative URL is given, prepend correct local hostname.
-            $scheme = 'on' == getenv('HTTPS') ? 'https' : 'http';
+            $scheme = getenv('HTTPS') ? 'https' : 'http';
             $host = getenv('HTTP_HOST');
             $url = sprintf('%s://%s%s', $scheme, $host, $url);
@@ -1612 +1612 @@
         }
 
-        if ('' == getenv('HTTPS') && $this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
+        if (!getenv('HTTPS') && $this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
             $this->raiseMsg(sprintf(_("Secure SSL connection made to %s"), $this->getParam('ssl_domain')), MSG_NOTICE, __FILE__, __LINE__);
             // Always append session because some browsers do not send cookie when crossing to SSL URL.
@@ -1657 +1657 @@
         // Defaults.
         $expire = (is_numeric($expire) ? $expire : (is_string($expire) ? strtotime($expire) : $expire));
-        $secure = $secure ?: ('' != getenv('HTTPS') && $this->getParam('ssl_enabled'));
+        $secure = $secure ?: (getenv('HTTPS') && $this->getParam('ssl_enabled'));
         $httponly = $httponly ?: true;
 

trunk/lib/Utilities.inc.php

@@ -1426 +1426 @@
 function absoluteMe()
 {
-    $protocol = ('on' == getenv('HTTPS')) ? 'https://' : 'http://';
-    return $protocol . getenv('HTTP_HOST') . getenv('REQUEST_URI');
+    return sprintf('%s://%s%s', (getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'), getenv('REQUEST_URI'));
 }