From 26501a0bc8c7c4fa8343f5fa0c6e42bae1c7f298 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 29 Aug 2012 13:58:39 -0400 Subject: Delete old link if user sets a password --- lib/public/share.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/public/share.php b/lib/public/share.php index 165e3df452f..91b1bffc2d7 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -229,6 +229,16 @@ class Share { $shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner)); } else if ($shareType === self::SHARE_TYPE_LINK) { if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') { + if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1)) { + // If password is set delete the old link + if (isset($shareWith)) { + self::delete($checkExists['id']); + } else { + $message = 'Sharing '.$itemSource.' failed, because this item is already shared with a link'; + \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); + throw new \Exception($message); + } + } // Generate hash of password - same method as user passwords if (isset($shareWith)) { $forcePortable = (CRYPT_BLOWFISH != 1); -- cgit v1.2.3