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

ignore "broken" grants (eg. negative account_id for a user), as they lead to further errors (no members)

Browse Source
This commit is contained in:
Ralf Becker 2013-02-25 09:49:43 +00:00
parent 5aa0d62712
commit 378074f989
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,6 +327,7 @@ class groupdav_principals extends groupdav_handler
foreach($expand_prop['val'] as &$prop_val) foreach($expand_prop['val'] as &$prop_val)
{ {
list(,$expand_path) = explode($this->groupdav->base_uri, $prop_val['val']); list(,$expand_path) = explode($this->groupdav->base_uri, $prop_val['val']);
//error_log(__METHOD__."('$path', ..., $user) calling propfind('$expand_path', ".array2string($options2).', '.array2string($prop_val).", $user)");
if ($this->propfind($expand_path, $options2, $prop_val, $user) !== true || !isset($prop_val['files'][0])) if ($this->propfind($expand_path, $options2, $prop_val, $user) !== true || !isset($prop_val['files'][0]))
{ {
throw new egw_exception_assertion_failed('no propfind for '.$expand_path); throw new egw_exception_assertion_failed('no propfind for '.$expand_path);
@ -1363,10 +1364,16 @@ class groupdav_principals extends groupdav_handler
if ($account_id !== 'run' && $account_id != $account && ($rights & $mask) == $right && if ($account_id !== 'run' && $account_id != $account && ($rights & $mask) == $right &&
($account_lid = $this->accounts->id2name($account_id))) ($account_lid = $this->accounts->id2name($account_id)))
{ {
// ignore "broken" grants (eg. negative account_id for a user), as they lead to further errors (no members)
if (($t = $this->accounts->exists($account_id) == 1 ? 'u' : 'g') !== $this->accounts->get_type($account_id))
{
error_log(__METHOD__."('$principal', '$type') broken grants from #$account_id ($account_lid) type=$t ignored!");
continue;
}
$proxys[$account_id] = $account_lid; $proxys[$account_id] = $account_lid;
// no need to add group-members, ACL grants to groups are understood by WebDAV ACL (tested with iCal) // no need to add group-members, ACL grants to groups are understood by WebDAV ACL (tested with iCal)
} }
//echo "<p>$account_id ($account_lid): (rights=$rights & mask=$mask) == right=$right --> ".array2string(($rights & $mask) == $right)."</p>\n"; //echo "<p>$account_id ($account_lid) type=$t: (rights=$rights & mask=$mask) == right=$right --> ".array2string(($rights & $mask) == $right)."</p>\n";
} }
return $this->add_principal($principal.'/'.$type, array( return $this->add_principal($principal.'/'.$type, array(
'displayname' => lang('%1 proxy of %2', lang($app).' '.lang($what), basename($principal)), 'displayname' => lang('%1 proxy of %2', lang($app).' '.lang($what), basename($principal)),