mirror of
https://github.com/friendica/friendica
synced 2025-04-26 14:30:13 +00:00
more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors
This commit is contained in:
parent
a598f17e6d
commit
3eefe8b500
10 changed files with 42 additions and 12 deletions
10
boot.php
10
boot.php
|
@ -283,10 +283,12 @@ class App {
|
|||
|
||||
$scheme = $this->scheme;
|
||||
|
||||
if(($ssl) || ($this->config['ssl_policy'] == SSL_POLICY_FULL))
|
||||
$scheme = 'https';
|
||||
if(($this->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
|
||||
$scheme = 'https';
|
||||
if(x($this->config,'ssl_policy')) {
|
||||
if(($ssl) || ($this->config['ssl_policy'] == SSL_POLICY_FULL))
|
||||
$scheme = 'https';
|
||||
if(($this->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 : '' );
|
||||
return $this->baseurl;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue