diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 09:21:37 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 09:21:37 +0200 |
| commit | 952433eae6cdf15e8615b4da682b81f4537b0ba0 (patch) | |
| tree | d0adb161a3184fd6890df1eca8922f87ad300836 /apps/files_encryption/lib/proxy.php | |
| parent | 46e47be78272b76c6c569a8f1589d78828d72ec1 (diff) | |
| parent | 5899485ca17045e93528c29d1ed63b02192c4191 (diff) | |
| download | nextcloud-server-952433eae6cdf15e8615b4da682b81f4537b0ba0.tar.gz nextcloud-server-952433eae6cdf15e8615b4da682b81f4537b0ba0.zip | |
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
Diffstat (limited to 'apps/files_encryption/lib/proxy.php')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index eb7ba60cb9d..4ec810a5199 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -50,9 +50,8 @@ class Proxy extends \OC_FileProxy { private static function shouldEncrypt($path) { if (is_null(self::$enableEncryption)) { - if ( - \OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true' + \OCP\App::isEnabled('files_encryption') === true && Crypt::mode() === 'server' ) { @@ -200,7 +199,7 @@ class Proxy extends \OC_FileProxy { */ public function preUnlink($path) { - // let the trashbin handle this + // let the trashbin handle this if (\OCP\App::isEnabled('files_trashbin')) { return true; } @@ -291,7 +290,7 @@ class Proxy extends \OC_FileProxy { // Close the original encrypted file fclose($result); - // Open the file using the crypto stream wrapper + // Open the file using the crypto stream wrapper // protocol and let it do the decryption work instead $result = fopen('crypt://' . $path, $meta['mode']); |