diff options
| author | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2013-07-04 19:23:31 +0300 |
|---|---|---|
| committer | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2013-07-09 17:46:11 +0300 |
| commit | 582631323acb52b8348975d29a871d950c2e6451 (patch) | |
| tree | efd31a08cb77079b27e1a10d3bb0d5c6ef703ff4 /apps | |
| parent | 5a3fce12a4496ec6d2903902e035af017e07f2f8 (diff) | |
| download | nextcloud-server-582631323acb52b8348975d29a871d950c2e6451.tar.gz nextcloud-server-582631323acb52b8348975d29a871d950c2e6451.zip | |
Migrate to encodePath
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/templates/part.breadcrumb.php | 3 | ||||
| -rw-r--r-- | apps/files/templates/part.list.php | 6 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/part.breadcrumb.php | 3 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/part.list.php | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 9886b42e424..9db27eb9b29 100644 --- a/apps/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php @@ -7,8 +7,7 @@ <?php endif;?> <?php for($i=0; $i<count($_["breadcrumb"]); $i++): $crumb = $_["breadcrumb"][$i]; - $dir = str_replace('+', '%20', urlencode($crumb["dir"])); - $dir = str_replace('%2F', '/', $dir); ?> + $dir = \OCP\Util::encodePath($crumb["dir"]); ?> <div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg" data-dir='<?php p($dir);?>'> <a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a> diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 502ddd329b1..97a9026860b 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -17,10 +17,8 @@ $totalsize = 0; ?> // 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>160) $relative_date_color = 160; - $name = rawurlencode($file['name']); - $name = str_replace('%2F', '/', $name); - $directory = rawurlencode($file['directory']); - $directory = str_replace('%2F', '/', $directory); ?> + $name = \OCP\Util::encodePath($file['name']); + $directory = \OCP\Util::encodePath($file['directory']); ?> <tr data-id="<?php p($file['fileid']); ?>" data-file="<?php p($name);?>" data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>" diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php index 2801e04e9ad..85bb16ffa2d 100644 --- a/apps/files_trashbin/templates/part.breadcrumb.php +++ b/apps/files_trashbin/templates/part.breadcrumb.php @@ -11,8 +11,7 @@ <?php endif;?> <?php for($i=0; $i<count($_["breadcrumb"]); $i++): $crumb = $_["breadcrumb"][$i]; - $dir = str_replace('+', '%20', urlencode($crumb["dir"])); - $dir = str_replace('%2F', '/', $dir); ?> + $dir = \OCP\Util::encodePath($crumb["dir"]); ?> <div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg" data-dir='<?php p($dir);?>'> <a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a> diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index 92a38bd2635..94a8eec9515 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -4,10 +4,8 @@ // the older the file, the brighter the shade of grey; days*14 $relative_date_color = round((time()-$file['date'])/60/60/24*14); if($relative_date_color>200) $relative_date_color = 200; - $name = str_replace('+', '%20', urlencode($file['name'])); - $name = str_replace('%2F', '/', $name); - $directory = str_replace('+', '%20', urlencode($file['directory'])); - $directory = str_replace('%2F', '/', $directory); ?> + $name = \OCP\Util::encodePath($file['name']); + $directory = \OCP\Util::encodePath($file['directory']); ?> <tr data-filename="<?php p($file['name']);?>" data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>" data-mime="<?php p($file['mimetype'])?>" |