AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use KANBOARD_URL to build URIs if specified

Browse Source
This commit is contained in:
Steve Bian
2020-02-05 15:00:04 +11:00
committed by GitHub
parent 54dd3bdd1c
commit 0a6f614571
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Helper/UrlHelper.php
View File

@@ -171,9 +171,13 @@ class UrlHelper extends Base
public function dir() public function dir()
{ {
if ($this->directory === '' && $this->request->getMethod() !== '') { if ($this->directory === '' && $this->request->getMethod() !== '') {
$this->directory = str_replace('\\', '/', dirname($this->request->getServerVariable('PHP_SELF'))); if (defined('KANBOARD_URL') && strlen(KANBOARD_URL) > 0) {
$this->directory = $this->directory !== '/' ? $this->directory.'/' : '/'; $this->directory = parse_url(KANBOARD_URL, PHP_URL_PATH);
$this->directory = str_replace('//', '/', $this->directory); } else {
$this->directory = str_replace('\\', '/', dirname($this->request->getServerVariable('PHP_SELF')));
$this->directory = $this->directory !== '/' ? $this->directory.'/' : '/';
$this->directory = str_replace('//', '/', $this->directory);
}
} }
return $this->directory; return $this->directory;