aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-26 16:21:48 -0700
committerfriendica <info@friendica.com>2012-05-26 16:21:48 -0700
commit5a7363b248e51b93c401a84d1b99f33632c44711 (patch)
treee65d7d352b5d0557a52d161d491ddee26154b040
parent73c61b6f96353ae7cbf73db7ed8b22f74f8ebdc3 (diff)
downloadvolse-hubzilla-5a7363b248e51b93c401a84d1b99f33632c44711.tar.gz
volse-hubzilla-5a7363b248e51b93c401a84d1b99f33632c44711.tar.bz2
volse-hubzilla-5a7363b248e51b93c401a84d1b99f33632c44711.zip
more ssl policy stuff
-rw-r--r--boot.php27
1 files changed, 12 insertions, 15 deletions
diff --git a/boot.php b/boot.php
index 3f4820d67..b41b8d9a0 100644
--- a/boot.php
+++ b/boot.php
@@ -441,22 +441,19 @@ if(! class_exists('App')) {
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
$scheme = 'https';
- // We need to populate the $ssl flag across the entire program before turning this on.
- // 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.
- // 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($ssl)
- // $scheme = 'https';
- // else
- // $scheme = 'http';
- // }
- }
+ // Basically, we 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.
+
+ if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+ if($ssl)
+ $scheme = 'https';
+ else
+ $scheme = 'http';
+ }
+ }
- $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
- return $this->baseurl;
+ $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+ return $this->baseurl;
}
function set_baseurl($url) {