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

Return application url if defined for the helper getCurrentBaseUrl()

This commit is contained in:
Frederic Guillot 2015-05-14 11:10:30 -04:00
parent 22f44ef788
commit b028b3586c
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Core/Helper.php
View File

@ -515,6 +515,12 @@ class Helper
*/
public function getCurrentBaseUrl()
{
$application_url = $this->config->get('application_url');
if (! empty($application_url)) {
return $application_url;
}
$self = str_replace('\\', '/', dirname($_SERVER['PHP_SELF']));
$url = Request::isHTTPS() ? 'https://' : 'http://';

17
tests/units/HelperTest.php
View File

@ -3,6 +3,7 @@
require_once __DIR__.'/Base.php';
use Core\Helper;
use Model\Config;
class HelperTest extends Base
{
@ -30,4 +31,20 @@ class HelperTest extends Base
)
);
}
public function testGetCurrentBaseUrl()
{
$h = new Helper($this->container);
$_SERVER['PHP_SELF'] = '/';
$_SERVER['SERVER_NAME'] = 'localhost';
$_SERVER['SERVER_PORT'] = 1234;
$this->assertEquals('http://localhost:1234/', $h->getCurrentBaseUrl());
$c = new Config($this->container);
$c->save(array('application_url' => 'https://mykanboard/'));
$this->assertEquals('https://mykanboard/', $c->get('application_url'));
$this->assertEquals('https://mykanboard/', $h->getCurrentBaseUrl());
}
}