aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/hooks
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-29 19:11:39 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-29 19:11:39 +0200
commitd2652645425777c1a97f8421e51aad9bdcf39684 (patch)
tree4fa7ce7d05060755361a77f49684e1c226653a6f /apps/files_encryption/hooks
parentae0f37e9e20a540ed93b99814f4eb066bd26aa88 (diff)
downloadnextcloud-server-d2652645425777c1a97f8421e51aad9bdcf39684.tar.gz
nextcloud-server-d2652645425777c1a97f8421e51aad9bdcf39684.zip
fix for share folder on external storage
Diffstat (limited to 'apps/files_encryption/hooks')
-rw-r--r--apps/files_encryption/hooks/hooks.php15
1 files changed, 14 insertions, 1 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 9af1f2c6459..4fc8fa75709 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -327,6 +327,13 @@ class Hooks {
// 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);
@@ -402,7 +409,13 @@ class Hooks {
// 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']);
+ }
+
$allFiles = $util->getAllFiles( $path );
} else {