diff options
| author | Friendika <info@friendika.com> | 2011-01-30 19:38:03 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-01-30 19:38:03 -0800 |
| commit | 3eefe8b50003c858d4930c03cc06d2679a14347c (patch) | |
| tree | de65f34172a862f7f720ce7e2cc922a6b9f07a31 /boot.php | |
| parent | a598f17e6d95d8a82df2994d61bfab74271dfe58 (diff) | |
| download | volse-hubzilla-3eefe8b50003c858d4930c03cc06d2679a14347c.tar.gz volse-hubzilla-3eefe8b50003c858d4930c03cc06d2679a14347c.tar.bz2 volse-hubzilla-3eefe8b50003c858d4930c03cc06d2679a14347c.zip | |
more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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; |