From a362dc46e3ea75a9223e753d854631f2b80c6762 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 29 Jan 2011 22:38:58 -0800 Subject: [PATCH] cleanup ssl_policy implementation --- boot.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 83ceaac280..c4afa07b0c 100644 --- a/boot.php +++ b/boot.php @@ -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; }