diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-20 11:21:34 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-20 11:21:34 +0200 |
| commit | 96c27ead9256999f3bcdf0647a77589851acd381 (patch) | |
| tree | 5e057b386dc3f222aaed2ad427c65fd6ae77412f /apps | |
| parent | 57092e817f3bb45c4ca030ba135d5f8c7d2a096b (diff) | |
| download | nextcloud-server-96c27ead9256999f3bcdf0647a77589851acd381.tar.gz nextcloud-server-96c27ead9256999f3bcdf0647a77589851acd381.zip | |
check if encryption app is enabled
Diffstat (limited to 'apps')
| -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..33851381919 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -51,8 +51,7 @@ class Proxy extends \OC_FileProxy { if (is_null(self::$enableEncryption)) { - if ( - \OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true' + if (\OCP\Config::getAppValue('files_encryption', 'enabled', 'true') === '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']); |