keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup ssl_policy implementation

Browse source
This commit is contained in:
Friendika 2011-01-29 22:38:58 -08:00
parent f970d9ab4d
commit a362dc46e3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boot.php
View file

@ -17,7 +17,7 @@ define ( 'DOWN_ARROW', '⇩' );
define ( 'SSL_POLICY_NONE', 0 ); define ( 'SSL_POLICY_NONE', 0 );
define ( 'SSL_POLICY_FULL', 1 ); 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) { function get_baseurl($ssl = false) {
if(strlen($this->baseurl)) // if(strlen($this->baseurl))
return $this->baseurl; // return $this->baseurl;
$scheme = $this->scheme; $scheme = $this->scheme;
@ -290,7 +290,7 @@ class App {
if(($a->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params'))) if(($a->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
$scheme = 'https'; $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; return $this->baseurl;
} }