Browse Source

Some more config stuff

tags/3.5.1
Michael 3 years ago
parent
commit
045e94ccf3
1 changed files with 11 additions and 13 deletions
  1. +11
    -13
      boot.php

+ 11
- 13
boot.php View File

@@ -825,24 +825,22 @@ class App {

$scheme = $this->scheme;

if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
$scheme = 'https';
}
if (Config::get('system', 'ssl_policy') === SSL_POLICY_FULL) {
$scheme = 'https';
}

// 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.
// 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';
}
if (Config::get('system', 'ssl_policy') == SSL_POLICY_SELFSIGN) {
if ($ssl) {
$scheme = 'https';
} else {
$scheme = 'http';
}
}

if (get_config('config', 'hostname') != '') {
if (Config::get('config', 'hostname') != '') {
$this->hostname = get_config('config', 'hostname');
}



Loading…
Cancel
Save