clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ping.php improvement: improving get_baseurl 

- Adding more documentation
- Trying hard to make @annando happy
This commit is contained in:
Hypolite Petovan 2016-11-01 17:05:23 -04:00
parent 5e188a9250
commit 97c2e99d46
1 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
boot.php
View File

@ -788,10 +788,18 @@ class App {
/** /**
* @brief Retrieves the Friendica instance base URL * @brief Retrieves the Friendica instance base URL
* *
* Caches both SSL and non-SSL version for performance * This function assembles the base URL from multiple parts:
* - Protocol is determined either by the request or a combination of
* system.ssl_policy and the $ssl parameter.
* - Host name is determined either by system.hostname or inferred from request
* - Path is inferred from SCRIPT_NAME
* *
* @param bool $ssl * Caches the result (depending on $ssl value) for performance.
* @return string *
* Note: $ssl parameter value doesn't directly correlate with the resulting protocol
*
* @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
* @return string Friendica server base URL
*/ */
function get_baseurl($ssl = false) { function get_baseurl($ssl = false) {
@ -800,34 +808,39 @@ class App {
return self::$a->get_baseurl($ssl); return self::$a->get_baseurl($ssl);
} }
// Arbitrary values, the resulting url protocol can be different
$cache_index = $ssl ? 'https' : 'http'; $cache_index = $ssl ? 'https' : 'http';
if (!isset($this->baseurl[$cache_index])) { // Cached value found, nothing to process
$scheme = $this->scheme; if (isset($this->baseurl[$cache_index])) {
return $this->baseurl[$cache_index];
if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
if (intval($this->config['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.
if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
if ($ssl) {
$scheme = 'https';
} else {
$scheme = 'http';
}
}
}
if (get_config('config', 'hostname') != '') {
$this->hostname = get_config('config', 'hostname');
}
$this->baseurl[$cache_index] = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
} }
$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';
}
// 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 (get_config('config', 'hostname') != '') {
$this->hostname = get_config('config', 'hostname');
}
$this->baseurl[$cache_index] = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $this->baseurl[$cache_index]; return $this->baseurl[$cache_index];
} }