more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors

This commit is contained in:
Friendika 2011-01-30 19:38:03 -08:00
parent a598f17e6d
commit 3eefe8b500
10 changed files with 42 additions and 12 deletions

View file

@ -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;