Move the redirect_url from linkTo function to the checkLoggedIn function

2 files changed, 8 insertions, 13 deletions

diff --git a/lib/helper.php b/lib/helper.php
index b1e6d053a19..2f71bdad2dc 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -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;
diff --git a/lib/util.php b/lib/util.php
index aa9fcdec65f..1b1e29b6749 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -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();
 		}
 	}