diff options
author | Friendika <info@friendika.com> | 2011-01-29 22:38:58 -0800 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-01-29 22:38:58 -0800 |
commit | a362dc46e3ea75a9223e753d854631f2b80c6762 (patch) | |
tree | cf5b7443d981a7b3d8290d8007bc130ec7909685 /boot.php | |
parent | f970d9ab4d608d36aca405c11746082156e1e661 (diff) | |
download | volse-hubzilla-a362dc46e3ea75a9223e753d854631f2b80c6762.tar.gz volse-hubzilla-a362dc46e3ea75a9223e753d854631f2b80c6762.tar.bz2 volse-hubzilla-a362dc46e3ea75a9223e753d854631f2b80c6762.zip |
cleanup ssl_policy implementation
Diffstat (limited to 'boot.php')
-rw-r--r-- | boot.php | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -17,7 +17,7 @@ define ( 'DOWN_ARROW', '⇩' ); define ( 'SSL_POLICY_NONE', 0 ); define ( 'SSL_POLICY_FULL', 1 ); -define ( 'SSL_POLICY_SELFSIGN' 2 ); +define ( 'SSL_POLICY_SELFSIGN', 2 ); /** @@ -280,8 +280,8 @@ class App { } function get_baseurl($ssl = false) { - if(strlen($this->baseurl)) - return $this->baseurl; +// if(strlen($this->baseurl)) +// return $this->baseurl; $scheme = $this->scheme; @@ -290,7 +290,7 @@ class App { if(($a->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params'))) $scheme = 'https'; - $this->baseurl = ( $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); + $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); return $this->baseurl; } |