diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-09-29 11:23:18 +0200 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-09-29 11:23:18 +0200 |
commit | 6e7acb8ae083c158fb412fa3e035e64a83063911 (patch) | |
tree | 65523f019b8d1869310b13347b538d70bf300359 /lib/private/share | |
parent | e5f0dded84a544f4ebd983ef8fb6d898df230575 (diff) | |
download | nextcloud-server-6e7acb8ae083c158fb412fa3e035e64a83063911.tar.gz nextcloud-server-6e7acb8ae083c158fb412fa3e035e64a83063911.zip |
some small fixed, suggested by scrutinizer
Diffstat (limited to 'lib/private/share')
-rw-r--r-- | lib/private/share/helper.php | 4 | ||||
-rw-r--r-- | lib/private/share/hooks.php | 2 | ||||
-rw-r--r-- | lib/private/share/share.php | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php index 90dd12e9842..2418535c9d5 100644 --- a/lib/private/share/helper.php +++ b/lib/private/share/helper.php @@ -36,6 +36,7 @@ class Helper extends \OC\Share\Constants { * @return string Item target */ public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null, $groupParent = null) { + // FIXME: $uidOwner and $groupParent seems to be unused $backend = \OC\Share\Share::getBackend($itemType); if ($shareType == self::SHARE_TYPE_LINK) { if (isset($suggestedTarget)) { @@ -53,9 +54,6 @@ class Helper extends \OC\Share\Constants { if ($shareType == self::SHARE_TYPE_USER) { // Share with is a user, so set share type to user and groups $shareType = self::$shareTypeUserAndGroups; - $userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith)); - } else { - $userAndGroups = false; } $exclude = array(); diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php index 2be7dc85e3c..66b197b921b 100644 --- a/lib/private/share/hooks.php +++ b/lib/private/share/hooks.php @@ -65,7 +65,7 @@ class Hooks extends \OC\Share\Constants { // do we also need a file target if ($item['item_type'] === 'file' || $item['item_type'] === 'folder') { - $fileTarget = Helper::generateTarget('file', $row['file_target'], self::SHARE_TYPE_USER, $arguments['uid'], + $fileTarget = Helper::generateTarget('file', $item['file_target'], self::SHARE_TYPE_USER, $arguments['uid'], $item['owner'], null, $item['parent']); } else { $fileTarget = null; diff --git a/lib/private/share/share.php b/lib/private/share/share.php index b34b134ee84..d861f0510e4 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -295,7 +295,7 @@ class Share extends \OC\Share\Constants { $shares = array(); $column = ($itemType === 'file' || $itemType === 'folder') ? 'file_source' : 'item_source'; - + $where = ' `' . $column . '` = ? AND `item_type` = ? '; $arguments = array($itemSource, $itemType); // for link shares $user === null @@ -706,7 +706,7 @@ class Share extends \OC\Share\Constants { // if there is more then one result we don't have to delete the children // but update their parent. For group shares the new parent should always be // the original group share and not the db entry with the unique name - } else if ((int)$item['share_type'] === \OCP\Share::$shareTypeGroupUserUnique) { + } else if ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) { $newParent = $item['parent']; } else { $newParent = $item['id']; @@ -1614,6 +1614,7 @@ class Share extends \OC\Share\Constants { $permissions, $parentFolder = null, $token = null, $itemSourceName = null, \DateTime $expirationDate = null) { $queriesToExecute = array(); + $suggestedItemTarget = null; $result = self::checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate); if(!empty($result)) { |