LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 4195d8ebab09f372cec383bb77fff1cedc75e101 

Monotone-Revision: 6d46b1f98d1e4729c6c951fd4d0ce045cda38d4f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-08-10T15:14:09
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-08-10 15:14:09 +00:00
parent 51f0a296f5
commit 12c629ff1f
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
SoObjects/SOGo/SOGoWebDAVAclManager.m
View File

@ -64,7 +64,7 @@ static NSNumber *yesObject = nil;
defaultRolesForPermission: permission];
if ([roles firstObjectCommonWithArray: userRoles])
{
// NSLog (@"matched '%@': %@", permission, roles);
// NSLog (@"matched '%@': %@", permission, roles);
result = YES;
}
else
@ -93,9 +93,9 @@ static NSNumber *yesObject = nil;
{
aclTree = [NSMutableDictionary new];
[self registerDAVPermission: davElement (@"all", @"DAV:")
abstract: YES
withEquivalent: nil
asChildOf: nil];
abstract: YES
withEquivalent: nil
asChildOf: nil];
}
return self;
@ -142,8 +142,8 @@ static NSNumber *yesObject = nil;
identifier = [davPermission keysWithFormat: @"{%{ns}}%{method}"];
if ([aclTree objectForKey: identifier])
[self warnWithFormat:
@"entry '%@' already exists in DAV permissions table",
identifier];
@"entry '%@' already exists in DAV permissions table",
identifier];
[aclTree setObject: newEntry forKey: identifier];
[newEntry setObject: davPermission forKey: @"permission"];
if (abstract)
@ -175,17 +175,18 @@ static NSNumber *yesObject = nil;
NSEnumerator *children;
BOOL appended, childrenAppended;
// NSLog (@"attempt to add permission: %@",
// [permission objectForKey: @"permission"]);
appended = YES;
if (matchSOGoPerms)
{
sogoPermission = [permission objectForKey: @"equivalent"];
if (sogoPermission
&& [soClass userRoles: userRoles havePermission: sogoPermission])
[davPermissions
addObject: [permission objectForKey: @"permission"]];
[davPermissions addObject: [permission objectForKey: @"permission"]];
else
appended = NO;
// NSLog (@"permission '%@' appended: %d", sogoPermission, appended);
// NSLog (@"permission '%@' appended: %d", sogoPermission, appended);
}
else
[davPermissions
@ -196,14 +197,16 @@ static NSNumber *yesObject = nil;
{
childrenAppended = YES;
while ((childPermission = [children nextObject]))
childrenAppended = (childrenAppended
&& [self _fillArray: davPermissions
withPermission: childPermission
forUserRoles: userRoles
withSoClass: soClass
matchSOGoPerms: (matchSOGoPerms && !appended)]);
childrenAppended &= [self _fillArray: davPermissions
withPermission: childPermission
forUserRoles: userRoles
withSoClass: soClass
matchSOGoPerms: (matchSOGoPerms
&& !appended)];
if (childrenAppended && !appended)
{
// NSLog (@" adding perm '%@' because children were appended",
// [permission objectForKey: @"permission"]);
[davPermissions
addObject: [permission objectForKey: @"permission"]];
appended = YES;