Changeset 676 for trunk/lib

Timestamp:

May 3, 2019 2:43:15 AM (5 years ago)

Author:

anonymous

Message:

Update admins.php. Fix $safe_http_host

File:

• trunk/lib/App.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -479 +479 @@
          */
 
-        $safe_http_host = preg_replace('/[^a-z\d.:-]/', '', getenv('HTTP_HOST'));
+        // To get a safe hostname, remove host port and invalid hostname characters.
+        $safe_http_host = preg_replace('/[^a-z\d.:-]/', '', strtok(getenv('HTTP_HOST'), ':'));
         if ('' != $safe_http_host && '' == $this->getParam('site_hostname')) {
             $this->setParam(array('site_hostname' => $safe_http_host));
@@ -487 +488 @@
         // and is used whenever a URL need be used to the current site.
         // Not available on CLI scripts obviously.
-        if ($safe_http_host && '' == $this->getParam('site_url')) {
+        if ('' != $safe_http_host && '' == $this->getParam('site_url')) {
             $this->setParam(array('site_url' => sprintf('%s://%s', (getenv('HTTPS') ? 'https' : 'http'), $safe_http_host)));
         }