mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move the redirect_url from linkTo function to the checkLoggedIn function

This commit is contained in:
Bart Visscher 2012-02-21 20:05:02 +01:00
parent 21f8d0992f
commit 987845c312
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/helper.php
View File

@ -29,12 +29,11 @@ class OC_Helper {
* @brief Creates an url
* @param $app app
* @param $file file
* @param $redirect_url redirect_url variable is appended to the URL
* @returns the url
*
* Returns a url to the given app and file.
*/
public static function linkTo( $app, $file, $redirect_url=NULL, $absolute=false ){
public static function linkTo( $app, $file ){
if( $app != '' ){
$app .= '/';
// Check if the app is in the app folder
@ -54,24 +53,19 @@ class OC_Helper {
}
}
if($redirect_url)
return $urlLinkTo.'?redirect_url='.urlencode($_SERVER["REQUEST_URI"]);
else
return $urlLinkTo;
return $urlLinkTo;
}
/**
* @brief Creates an absolute url
* @param $app app
* @param $file file
* @param $redirect_url redirect_url variable is appended to the URL
* @returns the url
*
* Returns a absolute url to the given app and file.
*/
public static function linkToAbsolute( $app, $file, $redirect_url=NULL ) {
$urlLinkTo = self::linkTo( $app, $file, $redirect_url );
public static function linkToAbsolute( $app, $file ) {
$urlLinkTo = self::linkTo( $app, $file );
// Checking if the request was made through HTTPS. The last in line is for IIS
$protocol = isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off');
$urlLinkTo = ($protocol?'https':'http') . '://' . $_SERVER['HTTP_HOST'] . $urlLinkTo;

7
lib/util.php
View File

@ -240,7 +240,7 @@ class OC_Util {
/**
* Check if the app is enabled, send json error msg if not
* Check if the app is enabled, redirects to home if not
*/
public static function checkAppEnabled($app){
if( !OC_App::isEnabled($app)){
@ -250,12 +250,13 @@ class OC_Util {
}
/**
* Check if the user is logged in, redirects to home if not
* Check if the user is logged in, redirects to home if not. With
* redirect URL parameter to the request URI.
*/
public static function checkLoggedIn(){
// Check if we are a user
if( !OC_User::isLoggedIn()){
header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', TRUE ));
header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ).'?redirect_url='.urlencode($_SERVER["REQUEST_URI"]));
exit();
}
}