Monotone-Parent: 4195d8ebab09f372cec383bb77fff1cedc75e101
Monotone-Revision: 6d46b1f98d1e4729c6c951fd4d0ce045cda38d4f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-08-10T15:14:09 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
51f0a296f5
commit
12c629ff1f
|
@ -64,7 +64,7 @@ static NSNumber *yesObject = nil;
|
||||||
defaultRolesForPermission: permission];
|
defaultRolesForPermission: permission];
|
||||||
if ([roles firstObjectCommonWithArray: userRoles])
|
if ([roles firstObjectCommonWithArray: userRoles])
|
||||||
{
|
{
|
||||||
// NSLog (@"matched '%@': %@", permission, roles);
|
// NSLog (@"matched '%@': %@", permission, roles);
|
||||||
result = YES;
|
result = YES;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -93,9 +93,9 @@ static NSNumber *yesObject = nil;
|
||||||
{
|
{
|
||||||
aclTree = [NSMutableDictionary new];
|
aclTree = [NSMutableDictionary new];
|
||||||
[self registerDAVPermission: davElement (@"all", @"DAV:")
|
[self registerDAVPermission: davElement (@"all", @"DAV:")
|
||||||
abstract: YES
|
abstract: YES
|
||||||
withEquivalent: nil
|
withEquivalent: nil
|
||||||
asChildOf: nil];
|
asChildOf: nil];
|
||||||
}
|
}
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
|
@ -142,8 +142,8 @@ static NSNumber *yesObject = nil;
|
||||||
identifier = [davPermission keysWithFormat: @"{%{ns}}%{method}"];
|
identifier = [davPermission keysWithFormat: @"{%{ns}}%{method}"];
|
||||||
if ([aclTree objectForKey: identifier])
|
if ([aclTree objectForKey: identifier])
|
||||||
[self warnWithFormat:
|
[self warnWithFormat:
|
||||||
@"entry '%@' already exists in DAV permissions table",
|
@"entry '%@' already exists in DAV permissions table",
|
||||||
identifier];
|
identifier];
|
||||||
[aclTree setObject: newEntry forKey: identifier];
|
[aclTree setObject: newEntry forKey: identifier];
|
||||||
[newEntry setObject: davPermission forKey: @"permission"];
|
[newEntry setObject: davPermission forKey: @"permission"];
|
||||||
if (abstract)
|
if (abstract)
|
||||||
|
@ -175,17 +175,18 @@ static NSNumber *yesObject = nil;
|
||||||
NSEnumerator *children;
|
NSEnumerator *children;
|
||||||
BOOL appended, childrenAppended;
|
BOOL appended, childrenAppended;
|
||||||
|
|
||||||
|
// NSLog (@"attempt to add permission: %@",
|
||||||
|
// [permission objectForKey: @"permission"]);
|
||||||
appended = YES;
|
appended = YES;
|
||||||
if (matchSOGoPerms)
|
if (matchSOGoPerms)
|
||||||
{
|
{
|
||||||
sogoPermission = [permission objectForKey: @"equivalent"];
|
sogoPermission = [permission objectForKey: @"equivalent"];
|
||||||
if (sogoPermission
|
if (sogoPermission
|
||||||
&& [soClass userRoles: userRoles havePermission: sogoPermission])
|
&& [soClass userRoles: userRoles havePermission: sogoPermission])
|
||||||
[davPermissions
|
[davPermissions addObject: [permission objectForKey: @"permission"]];
|
||||||
addObject: [permission objectForKey: @"permission"]];
|
|
||||||
else
|
else
|
||||||
appended = NO;
|
appended = NO;
|
||||||
// NSLog (@"permission '%@' appended: %d", sogoPermission, appended);
|
// NSLog (@"permission '%@' appended: %d", sogoPermission, appended);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
[davPermissions
|
[davPermissions
|
||||||
|
@ -196,14 +197,16 @@ static NSNumber *yesObject = nil;
|
||||||
{
|
{
|
||||||
childrenAppended = YES;
|
childrenAppended = YES;
|
||||||
while ((childPermission = [children nextObject]))
|
while ((childPermission = [children nextObject]))
|
||||||
childrenAppended = (childrenAppended
|
childrenAppended &= [self _fillArray: davPermissions
|
||||||
&& [self _fillArray: davPermissions
|
withPermission: childPermission
|
||||||
withPermission: childPermission
|
forUserRoles: userRoles
|
||||||
forUserRoles: userRoles
|
withSoClass: soClass
|
||||||
withSoClass: soClass
|
matchSOGoPerms: (matchSOGoPerms
|
||||||
matchSOGoPerms: (matchSOGoPerms && !appended)]);
|
&& !appended)];
|
||||||
if (childrenAppended && !appended)
|
if (childrenAppended && !appended)
|
||||||
{
|
{
|
||||||
|
// NSLog (@" adding perm '%@' because children were appended",
|
||||||
|
// [permission objectForKey: @"permission"]);
|
||||||
[davPermissions
|
[davPermissions
|
||||||
addObject: [permission objectForKey: @"permission"]];
|
addObject: [permission objectForKey: @"permission"]];
|
||||||
appended = YES;
|
appended = YES;
|
||||||
|
|
Loading…
Reference in a new issue