diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-02-06 16:01:42 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-02-07 12:53:13 +0100 |
| commit | a8943ad02207afbf142ec48f4b53cbe1be943253 (patch) | |
| tree | 9746109ab2fe427fc5a6c79f48928336bfac3607 /apps/files_sharing/lib/share | |
| parent | b9e724d4ae7635435b3cc7793237c3ab9fe2a1c0 (diff) | |
| download | nextcloud-server-a8943ad02207afbf142ec48f4b53cbe1be943253.tar.gz nextcloud-server-a8943ad02207afbf142ec48f4b53cbe1be943253.zip | |
replace 'size' with 'unencrypted_size' if encryption is enabled
Diffstat (limited to 'apps/files_sharing/lib/share')
| -rw-r--r-- | apps/files_sharing/lib/share/file.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index c956c55a1df..ec0f368386f 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -91,10 +91,17 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { $file['name'] = basename($item['file_target']); $file['mimetype'] = $item['mimetype']; $file['mimepart'] = $item['mimepart']; - $file['size'] = $item['size']; $file['mtime'] = $item['mtime']; $file['encrypted'] = $item['encrypted']; $file['etag'] = $item['etag']; + $storage = \OC\Files\Filesystem::getStorage('/'); + $cache = $storage->getCache(); + if ($item['encrypted'] or ($item['unencrypted_size'] > 0 and $cache->getMimetype($item['mimetype']) === 'httpd/unix-directory')) { + $file['size'] = $item['unencrypted_size']; + $file['encrypted_size'] = $item['size']; + } else { + $file['size'] = $item['size']; + } $files[] = $file; } return $files; |