From 23e97216449ad65b4334dd68f84902ab08b0d62d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 31 Jul 2013 16:35:14 +0200
Subject: [PATCH] use OC\Files\View to read encrypted file, so that it also
works with external storages
---
apps/files_encryption/lib/util.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 7983c829e1..979b0fac40 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -768,9 +768,6 @@ class Util {
$decryptedFiles[] = array();
- // Disable proxy to prevent file being encrypted twice
- \OC_FileProxy::$enabled = false;
-
// Encrypt unencrypted files
foreach ($found['encrypted'] as $encryptedFile) {
@@ -780,8 +777,14 @@ class Util {
//relative to /data
$rawPath = $encryptedFile['path'];
+ //enable proxy to use OC\Files\View to access the original file
+ \OC_FileProxy::$enabled = true;
+
// Open enc file handle for binary reading
- $encHandle = fopen('crypt://' . $rawPath, 'rb');
+ $encHandle = $this->view->fopen($rawPath, 'rb');
+
+ // Disable proxy to prevent file being encrypted again
+ \OC_FileProxy::$enabled = false;
if ($encHandle === false) {
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $rawPath . '", decryption failed!', \OCP\Util::FATAL);
--
GitLab