wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'

Browse source
This commit is contained in:
Michael Gapczynski 2012-07-28 11:06:36 -04:00
parent e02d8d7f7e
commit 7ff04be091
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_sharing/lib_share.php
View file

@ -179,10 +179,13 @@ class OC_Share {
$uid_shared_with = OC_Group::usersInGroup($uid_shared_with);
// Remove the owner from the list of users in the group
$uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser()));
} else if ($uid = strrchr($uid_shared_with, '@', true)) {
$uid_shared_with = array($uid);
} else {
$uid_shared_with = array($uid_shared_with);
$pos = strrpos($uid_shared_with, '@');
if ($pos !== false && OC_Group::groupExists(substr($uid_shared_with, $pos + 1))) {
$uid_shared_with = array(substr($uid_shared_with, 0, $pos));
} else {
$uid_shared_with = array($uid_shared_with);
}
}
foreach ($uid_shared_with as $uid) {
$sharedFolder = $uid.'/files/Shared';