From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 6 Apr 2013 18:55:44 +0000 (-0700)
Subject: Merge pull request #1974 from owncloud/use-rawurlencode
X-Git-Tag: v6.0.0alpha2~951
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=248e097f3cdd258e00bea373e84add14a7665a5b;p=nextcloud-server.git

Merge pull request #1974 from owncloud/use-rawurlencode

OC6- Just use rawurlencode in files list template
---

248e097f3cdd258e00bea373e84add14a7665a5b
diff --cc apps/files/templates/part.list.php
index 59267690e66,8b7ae236387..1719d25e660
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@@ -9,21 -9,21 +9,21 @@@
  	// the older the file, the brighter the shade of grey; days*14
  	$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
  	if($relative_date_color>200) $relative_date_color = 200;
- 	$name = str_replace('+', '%20', urlencode($file['name']));
+ 	$name = rawurlencode($file['name']);
  	$name = str_replace('%2F', '/', $name);
- 	$directory = str_replace('+', '%20', urlencode($file['directory']));
+ 	$directory = rawurlencode($file['directory']);
  	$directory = str_replace('%2F', '/', $directory); ?>
 -	<tr data-id="<?php echo $file['fileid']; ?>"
 -		data-file="<?php echo $name;?>"
 -		data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>"
 -		data-mime="<?php echo $file['mimetype']?>"
 -		data-size='<?php echo $file['size'];?>'
 -		data-permissions='<?php echo $file['permissions']; ?>'>
 +	<tr data-id="<?php p($file['fileid']); ?>"
 +		data-file="<?php p($name);?>"
 +		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
 +		data-mime="<?php p($file['mimetype'])?>"
 +		data-size='<?php p($file['size']);?>'
 +		data-permissions='<?php p($file['permissions']); ?>'>
  		<td class="filename svg"
  		<?php if($file['type'] == 'dir'): ?>
 -			style="background-image:url(<?php echo OCP\mimetype_icon('dir'); ?>)"
 +			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
  		<?php else: ?>
 -			style="background-image:url(<?php echo OCP\mimetype_icon($file['mimetype']); ?>)"
 +			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
  		<?php endif; ?>
  			>
  		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>