wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7613 from owncloud/fix_urlGenerator2

Browse source 
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
This commit is contained in:
Vincent Petry 2014-03-28 12:12:49 +01:00
commit 5068c57845
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/urlgenerator.php
View file

@ -148,6 +148,7 @@ class URLGenerator implements IURLGenerator {
*/
public function getAbsoluteURL($url) {
$separator = $url[0] === '/' ? '' : '/';
return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $separator . $url;
return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost(). \OC::$WEBROOT . $separator . $url;
}
}

30
tests/lib/urlgenerator.php
View file

@ -12,17 +12,32 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
/**
* @small
* @brief test absolute URL construction
* @dataProvider provideURLs
* @dataProvider provideDocRootURLs
*/
function testGetAbsoluteURL($url, $expectedResult) {
function testGetAbsoluteURLDocRoot($url, $expectedResult) {
\OC::$WEBROOT = '';
$urlGenerator = new \OC\URLGenerator(null);
$result = $urlGenerator->getAbsoluteURL($url);
$this->assertEquals($expectedResult, $result);
}
public function provideURLs() {
/**
* @small
* @brief test absolute URL construction
* @dataProvider provideSubDirURLs
*/
function testGetAbsoluteURLSubDir($url, $expectedResult) {
\OC::$WEBROOT = '/owncloud';
$urlGenerator = new \OC\URLGenerator(null);
$result = $urlGenerator->getAbsoluteURL($url);
$this->assertEquals($expectedResult, $result);
}
public function provideDocRootURLs() {
return array(
array("index.php", "http://localhost/index.php"),
array("/index.php", "http://localhost/index.php"),
@ -30,5 +45,14 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
array("apps/index.php", "http://localhost/apps/index.php"),
);
}
public function provideSubDirURLs() {
return array(
array("index.php", "http://localhost/owncloud/index.php"),
array("/index.php", "http://localhost/owncloud/index.php"),
array("/apps/index.php", "http://localhost/owncloud/apps/index.php"),
array("apps/index.php", "http://localhost/owncloud/apps/index.php"),
);
}
}