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

Use getAbsoluteUrl for redirection URL

Browse source 
Also separate the function into getDefaultPageUrl() and
redirectToDefaultPage() to make it testable.
This commit is contained in:
Vincent Petry 2014-07-01 16:02:38 +02:00
parent c005515ebd
commit 3e78f41d00
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/private/util.php
View file

@ -815,10 +815,13 @@ class OC_Util {
}
/**
* Redirect to the user default page
* @return void
* Returns the URL of the default page
* based on the system configuration and
* the apps visible for the current user
*
* @return string URL
*/
public static function redirectToDefaultPage() {
public static function getDefaultPageUrl() {
$urlGenerator = \OC::$server->getURLGenerator();
if(isset($_REQUEST['redirect_url'])) {
$location = urldecode($_REQUEST['redirect_url']);
@ -837,9 +840,18 @@ class OC_Util {
break;
}
}
$location = $urlGenerator->linkTo($appId, 'index.php');
$location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
}
}
return $location;
}
/**
* Redirect to the user default page
* @return void
*/
public static function redirectToDefaultPage() {
$location = self::getDefaultPageUrl();
OC_Log::write('core', 'redirectToDefaultPage: '.$location, OC_Log::DEBUG);
header('Location: '.$location);
exit();