extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-07 03:31:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed share links were reused, event if attributes were different (password, expires, writable)

Browse Source
This commit is contained in:
Ralf Becker 2015-02-11 21:52:29 +00:00
parent 423e2abf77
commit 9d68f9f8b4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.egw_sharing.inc.php
View File

@ -371,12 +371,15 @@ class egw_sharing
{ {
throw new egw_exception_not_found("'$path' NOT found!"); throw new egw_exception_not_found("'$path' NOT found!");
} }
// check if file has been shared before // check if file has been shared before, with identical attributes
if (($mode != self::LINK || isset($path2tmp[$path])) && if (($mode != self::LINK || isset($path2tmp[$path])) &&
($share = self::$db->select(self::TABLE, '*', array( ($share = self::$db->select(self::TABLE, '*', $extra+array(
'share_path' => $mode == 'link' ? $path2tmp[$path] : $vfs_path, 'share_path' => $mode == 'link' ? $path2tmp[$path] : $vfs_path,
'share_owner' => $GLOBALS['egw_info']['user']['account_id'], 'share_owner' => $GLOBALS['egw_info']['user']['account_id'],
)+$extra, __LINE__, __FILE__)->fetch())) 'share_expires' => null,
'share_passwd' => null,
'share_writable'=> false,
), __LINE__, __FILE__)->fetch()))
{ {
// if yes, just add additional recipients // if yes, just add additional recipients
$share['share_with'] = $share['share_with'] ? explode(',', $share['share_with']) : array(); $share['share_with'] = $share['share_with'] ? explode(',', $share['share_with']) : array();