more ssl policy stuff
This commit is contained in:
parent
73c61b6f96
commit
5a7363b248
25
boot.php
25
boot.php
|
@ -441,22 +441,19 @@ if(! class_exists('App')) {
|
||||||
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
|
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
|
||||||
$scheme = 'https';
|
$scheme = 'https';
|
||||||
|
|
||||||
// We need to populate the $ssl flag across the entire program before turning this on.
|
// Basically, we have $ssl = true on any links which can only be seen by a logged in user
|
||||||
// Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
|
// (and also the login link). Anything seen by an outsider will have it turned off.
|
||||||
// (and also the login link). Anything seen by an outsider will have it turned off.
|
|
||||||
// At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
|
|
||||||
// contact links to this site with "http:" if they are currently using "https:"
|
|
||||||
|
|
||||||
// if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
||||||
// if($ssl)
|
if($ssl)
|
||||||
// $scheme = 'https';
|
$scheme = 'https';
|
||||||
// else
|
else
|
||||||
// $scheme = 'http';
|
$scheme = 'http';
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$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;
|
||||||
}
|
}
|
||||||
|
|
||||||
function set_baseurl($url) {
|
function set_baseurl($url) {
|
||||||
|
|
Loading…
Reference in a new issue