webdav fix for file chunking

upload with big files should now work
@samtuke and @schiesbn we need a solution for the cache files created by webdav

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index c07b9a8a7aad1aa0784802dbe1a2370144262775..66ea282312e15da5661add3c25cb49dc3e0dcb7b 100644 (file)
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -337,7 +337,12 @@ class Proxy extends \OC_FileProxy {
         // Reformat path for use with OC_FSV
                $path_split = explode( '/', $path );
                $path_f = implode( '/', array_slice( $path_split, 3 ) );
-               
+
+        // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
+        if($path_split[2] == 'cache') {
+            return $result;
+        }
+
                // Disable encryption proxy to prevent recursive calls
         $proxyStatus = \OC_FileProxy::$enabled;
         \OC_FileProxy::$enabled = false;

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f9198e0606aff08620bf80499b8743a6f0e20864..2198963ce14ef2bb0abc87fc17fece24d495f44d 100644 (file)
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -880,7 +880,7 @@ class Util {
                        
                } else {
                
-                       throw new \Exception( 'Supplied path could not be resolved "' . $path . '"' );
+                       return false;
                        
                }