webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-27 06:01:54 +03:00
Code Activity

Updated custom request overrides to better match original intent

Browse Source 
This updates the custom Request handler to provide only the scheme and
host on the `getSchemeAndHttpHost` call, instead of providing the whole
APP_URL value, while adding an override to the 'getBaseUrl' to use the
APP_URL content instead of the guessed/detected Symfony value.

Untested apart from simple local setup.

Related to #2765
This commit is contained in:
Dan Brown
2022-04-02 17:14:37 +01:00
parent affae2e3c4
commit 4dce03c0d3
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Request.php
View File

@ -8,20 +8,35 @@ class Request extends LaravelRequest
{ {
/** /**
* Override the default request methods to get the scheme and host * Override the default request methods to get the scheme and host
* to set the custom APP_URL, if set. * to directly use the custom APP_URL, if set.
* *
* @return \Illuminate\Config\Repository|mixed|string * @return string
*/ */
public function getSchemeAndHttpHost() public function getSchemeAndHttpHost()
{ {
$base = config('app.url', null); $appUrl = config('app.url', null);
if ($base) { if ($appUrl) {
$base = trim($base, '/'); return implode('/', array_slice(explode('/', $appUrl), 0, 3));
} else {
$base = $this->getScheme() . '://' . $this->getHttpHost();
} }
return $base; return parent::getSchemeAndHttpHost();
}
/**
* Override the default request methods to get the base URL
* to directly use the custom APP_URL, if set.
*
* @return string
*/
public function getBaseUrl()
{
$appUrl = config('app.url', null);
if ($appUrl) {
return rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/');
}
return parent::getBaseUrl();
} }
} }