diff options
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 3 | ||||
| -rw-r--r-- | apps/files_encryption/lib/util.php | 33 |
2 files changed, 22 insertions, 14 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 8f03087e568..f843c7027d5 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -231,8 +231,9 @@ class Hooks { $util = new Util($view, $userId);
$path = $util->fileIdToPath($params['itemSource']);
+ $share = $util->getParentFromShare($params['id']);
//if parent is set, then this is a re-share action
- if ($params['parent']) {
+ if ($share['parent'] != null) {
// get the parent from current share
$parent = $util->getShareParent($params['parent']);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 6eee1ada8a8..91d86cc8558 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -1133,19 +1133,7 @@ class Util { } - // Make path relative for use by $view - $relpath = \OC\Files\Filesystem::normalizePath($fileOwnerUid . '/' . $this->fileFolderName . '/' . $filename); - - // Check that the filename we're using is working - if ( $this->view->file_exists( $relpath ) ) { - - return array ( $fileOwnerUid, $filename ); - - } else { - - return false; - - } + return array ( $fileOwnerUid, $filename ); } @@ -1231,6 +1219,25 @@ class Util { } /** + * @brief get shares parent. + * @param int $id of the current share + * @return array of the parent + */ + public static function getParentFromShare( $id ) { + + $query = \OC_DB::prepare( 'SELECT `parent`' + .' FROM `*PREFIX*share`' + .' WHERE `id` = ?' ); + + $result = $query->execute( array( $id ) ); + + $row = $result->fetchRow(); + + return $row; + + } + + /** * @brief get owner of the shared files. * @param int $Id of a share * @return owner |