From 22d22d19c079f54cf12a6b47981c22aa1432346d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 28 Sep 2012 22:27:52 +0200
Subject: [PATCH] Do urlencoding in linkTo functions

---
 apps/files_versions/templates/history.php | 2 +-
 core/lostpassword/index.php               | 2 +-
 lib/helper.php                            | 4 +++-
 lib/public/util.php                       | 2 ++
 lib/search/provider/file.php              | 1 -
 lib/util.php                              | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 99bc153a81..854d032da6 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -22,7 +22,7 @@ if( isset( $_['message'] ) ) {
 	foreach ( $_['versions'] as $v ) {
 		echo ' ';
 		echo OCP\Util::formatDate( doubleval($v['version']) );
-		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => urlencode( $_['path'] ), 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
+		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
 		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
 		echo '<br /><br />';
 	}
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 3f58b03c98..8da86d5a36 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -17,7 +17,7 @@ if (isset($_POST['user'])) {
 		OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token);
 		$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
 		if (!empty($email) and isset($_POST['sectoken']) and isset($_SESSION['sectoken']) and ($_POST['sectoken']==$_SESSION['sectoken']) ) {
-			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => urlencode($_POST['user']), 'token' => $token));
+			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => $_POST['user'], 'token' => $token));
 			$tmpl = new OC_Template('core/lostpassword', 'email');
 			$tmpl->assign('link', $link, false);
 			$msg = $tmpl->fetchPage();
diff --git a/lib/helper.php b/lib/helper.php
index 3bb3062017..8e578735f4 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -33,6 +33,7 @@ class OC_Helper {
 	 * @param string $app app
 	 * @param string $file file
 	 * @param array $args array with param=>value, will be appended to the returned url
+	 * 	The value of $args will be urlencoded
 	 * @return string the url
 	 *
 	 * Returns a url to the given app and file.
@@ -65,7 +66,7 @@ class OC_Helper {
 		if (!empty($args)) {
 			$urlLinkTo .= '?';
 			foreach($args as $k => $v) {
-				$urlLinkTo .= '&'.$k.'='.$v;
+				$urlLinkTo .= '&'.$k.'='.urlencode($v);
 			}
 		}
 
@@ -77,6 +78,7 @@ class OC_Helper {
 	 * @param string $app app
 	 * @param string $file file
 	 * @param array $args array with param=>value, will be appended to the returned url
+	 * 	The value of $args will be urlencoded
 	 * @return string the url
 	 *
 	 * Returns a absolute url to the given app and file.
diff --git a/lib/public/util.php b/lib/public/util.php
index 747448e62e..38da7e8217 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -116,6 +116,7 @@ class Util {
 	 * @param $app app
 	 * @param $file file
 	 * @param $args array with param=>value, will be appended to the returned url
+	 * 	The value of $args will be urlencoded
 	 * @returns the url
 	 *
 	 * Returns a absolute url to the given app and file.
@@ -151,6 +152,7 @@ class Util {
 	* @param $app app
 	* @param $file file
 	* @param $args array with param=>value, will be appended to the returned url
+	* 	The value of $args will be urlencoded
 	* @returns the url
 	*
 	* Returns a url to the given app and file.
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 21fae0c1ce..e21278f391 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -10,7 +10,6 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 
 			$name = basename($path);
 			$text = '';
-			$path = urlencode($path);
 			if($mime=='httpd/unix-directory') {
 				$link = OC_Helper::linkTo( 'files', 'index.php', array('dir' => $path));
 				$type = 'Files';
diff --git a/lib/util.php b/lib/util.php
index 777cb7a28f..d1227f8379 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -344,7 +344,7 @@ class OC_Util {
 	public static function checkLoggedIn() {
 		// Check if we are a user
 		if( !OC_User::isLoggedIn()) {
-			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', array('redirect_url' => urlencode($_SERVER["REQUEST_URI"]))));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', array('redirect_url' => $_SERVER["REQUEST_URI"])));
 			exit();
 		}
 	}