diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-26 14:21:06 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-26 14:21:06 +0100 |
| commit | d4d09b06f80462394983fe04d291a0345dd57280 (patch) | |
| tree | e4452055533c7ec7bb6fa49ac7f6b5c93ba8c4f7 /apps/files_encryption | |
| parent | ea8f71a19c59e7138d4a504bacc0beb410fc77e8 (diff) | |
| parent | 3d0d47957e65a72e17d33a924c9c4efcd5088ed2 (diff) | |
| download | nextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.tar.gz nextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.zip | |
merge master into encryption
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index ed3907cccfe..5c83171dda2 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -104,16 +104,6 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ } return $result; } - - public function preReadFile($path){ - if(self::isEncrypted($path)){ - $stream=fopen('crypt://'.$path,'r'); - while(!feof($stream)){ - print(fread($stream,8192)); - } - return false;//cancel the original request - } - } public function postGetMimeType($path,$mime){ if((!OC_FileCache::inCache($path) and self::shouldEncrypt($path)) or self::isEncrypted($path)){ |