summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-11 00:23:30 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-11 00:23:30 +0200
commite88595638c787e04d1cd6c2df2aabf82ba4729d1 (patch)
treeed10ad9dfd82e3c98ad94207357010fb9a96d958
parentdc8164a3f09d45b8df195df791fa21ddbd2e510d (diff)
downloadnextcloud-server-e88595638c787e04d1cd6c2df2aabf82ba4729d1.tar.gz
nextcloud-server-e88595638c787e04d1cd6c2df2aabf82ba4729d1.zip
fix for webdav
-rw-r--r--apps/files_encryption/lib/proxy.php2
-rw-r--r--apps/files_encryption/lib/stream.php2
-rw-r--r--apps/files_encryption/lib/util.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ae36b9fe09f..3f8b8571252 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -492,7 +492,7 @@ class Proxy extends \OC_FileProxy {
if($fixSize > 0) {
$size = $fixSize;
- $fileInfo['encrypted'] = 1;
+ $fileInfo['encrypted'] = true;
$fileInfo['unencrypted_size'] = $size;
// put file info
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index c2b13b00b24..33b3255e2af 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -519,7 +519,7 @@ class Stream {
}
// set encryption data
- $fileInfo['encrypted'] = 1;
+ $fileInfo['encrypted'] = true;
$fileInfo['size'] = $this->size;
$fileInfo['unencrypted_size'] = $this->unencryptedSize;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 04b1e66f58a..ae8c7ffd575 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -94,7 +94,7 @@ class Util {
// Integration testing:
//// TODO: test new encryption with versioning
- //// TODO: test new encryption with sharing
+ //// DONE: test new encryption with sharing
//// TODO: test new encryption with proxies
@@ -533,7 +533,7 @@ class Util {
if ( $realSize > 0 ) {
$cached = $this->view->getFileInfo( $path );
- $cached['encrypted'] = 1;
+ $cached['encrypted'] = true;
// set the size
$cached['unencrypted_size'] = $realSize;