mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check if encryption app is enabled

This commit is contained in:
Bjoern Schiessle 2013-09-20 11:21:34 +02:00
parent 57092e817f
commit 96c27ead92
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files_encryption/lib/proxy.php
View File

@ -51,8 +51,7 @@ class Proxy extends \OC_FileProxy {
if (is_null(self::$enableEncryption)) { if (is_null(self::$enableEncryption)) {
if ( if (\OCP\Config::getAppValue('files_encryption', 'enabled', 'true') === 'true'
\OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true'
&& Crypt::mode() === 'server' && Crypt::mode() === 'server'
) { ) {
@ -200,7 +199,7 @@ class Proxy extends \OC_FileProxy {
*/ */
public function preUnlink($path) { public function preUnlink($path) {
// let the trashbin handle this // let the trashbin handle this
if (\OCP\App::isEnabled('files_trashbin')) { if (\OCP\App::isEnabled('files_trashbin')) {
return true; return true;
} }
@ -291,7 +290,7 @@ class Proxy extends \OC_FileProxy {
// Close the original encrypted file // Close the original encrypted file
fclose($result); 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 // protocol and let it do the decryption work instead
$result = fopen('crypt://' . $path, $meta['mode']); $result = fopen('crypt://' . $path, $meta['mode']);