Fix bug oc-542, encode urls for private links

This commit is contained in:
Michael Gapczynski 2012-05-07 11:30:36 -04:00
parent 71423ec566
commit e0a5f976e7
2 changed files with 2 additions and 2 deletions

View File

@ -19,7 +19,7 @@ while ($path != $userDirectory) {
$item['privateLink'] = $token;
} else {
// If in parent folder, include a path parameter to get direct access to file
$item['privateLink'] = $token.'&path='.substr($source, strlen($path));
$item['privateLink'] = $token.'&path='.str_replace('%2F', '/', str_replace('+', '%20', urlencode(substr($source, strlen($path)))));;
}
} else {
// Check if uid_shared_with is a group

View File

@ -179,7 +179,7 @@ OC.Share={
$('#privateLinkCheckbox').attr('checked', true);
var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&token='+token;
if (token.indexOf('&path=') == -1) {
link += '&file=' + item;
link += '&file=' + encodeURIComponent(item);
} else {
// Disable checkbox if inside a shared parent folder
$('#privateLinkCheckbox').attr('disabled', 'true');