From 6d94b393bf501ead44281cd4c2ce2483e18ed47f Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Thu, 30 May 2013 01:38:11 +0200 Subject: [PATCH] fix share and un-share for single file --- apps/files_encryption/hooks/hooks.php | 36 ++++++++++----------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 9893cecc94..eb9a2600d7 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -327,15 +327,14 @@ class Hooks { $sharingEnabled = \OCP\Share::isEnabled(); + // get the path including mount point only if not a shared folder + if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) { + // get path including the the storage mount point + $path = $util->getPathWithMountPoint($params['itemSource']); + } + // if a folder was shared, get a list of all (sub-)folders if ($params['itemType'] === 'folder') { - - // get the path including mount point only if not a shared folder - if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) { - // get path including the the storage mount point - $path = $util->getPathWithMountPoint($params['itemSource']); - } - $allFiles = $util->getAllFiles($path); } else { $allFiles = array($path); @@ -383,17 +382,11 @@ class Hooks { // rebuild path foreach ($targetPathSplit as $pathPart) { - if ($pathPart !== $sharedPart) { - $path = '/' . $pathPart . $path; - } else { - break; - } - } // prefix path with Shared @@ -411,19 +404,16 @@ class Hooks { } } + // get the path including mount point only if not a shared folder + if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) { + // get path including the the storage mount point + $path = $util->getPathWithMountPoint($params['itemSource']); + } + // if we unshare a folder we need a list of all (sub-)files - if ( $params['itemType'] === 'folder' ) { - - // get the path including mount point only if not a shared folder - if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) { - // get path including the the storage mount point - $path = $util->getPathWithMountPoint($params['itemSource']); - } - + if ($params['itemType'] === 'folder') { $allFiles = $util->getAllFiles( $path ); - } else { - $allFiles = array($path); }