amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-05 20:10:33 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 5bef03fdbb4e4f3112fabf6812f1a2e0932c85a9
Monotone-Revision: 785d7cb3b05b0317ec2ce52a1f17d6c130bf53fb

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-10-15T18:30:08
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-10-15 18:30:08 +00:00
parent 3ab3e25a00
commit a467b556c1
7 changed files with 117 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoGCSFolder.m
+27 -15
View File
@@ -72,6 +72,7 @@
#import "SOGoUser.h"
#import "SOGoUserDefaults.h"
#import "SOGoUserSettings.h"
#import "SOGoUserManager.h"
#import "SOGoWebDAVAclManager.h"
#import "WORequest+SOGo.h"
#import "WOResponse+SOGo.h"
@@ -198,7 +199,6 @@ static NSArray *childRecordFields = nil;
{
ocsPath = nil;
ocsFolder = nil;
aclCache = [NSMutableDictionary new];
childRecords = [NSMutableDictionary new];
userCanAccessAllObjects = NO;
}
@@ -210,7 +210,6 @@ static NSArray *childRecordFields = nil;
{
[ocsFolder release];
[ocsPath release];
[aclCache release];
[childRecords release];
[super dealloc];
}
@@ -286,11 +285,14 @@ static NSArray *childRecordFields = nil;
if (!activeUserIsOwner)
{
ownerIdentity = [[SOGoUser userWithLogin: owner]
primaryIdentity];
[displayName
appendString: [ownerIdentity keysWithFormat:
@" (%{fullName} <%{email}>)"]];
// We MUST NOT use SOGoUser instances here (by calling -primaryIdentity)
// as it'll load user defaults and user settings which is _very costly_
// since it involves JSON parsing and database requests
ownerIdentity = [[SOGoUserManager sharedUserManager]
contactInfosForUserWithUIDorEmail: owner];
[displayName appendFormat: @" (%@ <%@>)", [ownerIdentity objectForKey: @"cn"],
[ownerIdentity objectForKey: @"c_email"]];
}
}
}
@@ -1480,17 +1482,23 @@ static NSArray *childRecordFields = nil;
{
NSMutableDictionary *aclsForObject;
aclsForObject = [aclCache objectForKey: objectPath];
aclsForObject = [[SOGoCache sharedCache] aclsForPath: objectPath];
if (!aclsForObject)
{
aclsForObject = [NSMutableDictionary dictionary];
[aclCache setObject: aclsForObject
forKey: objectPath];
}
if (roles)
[aclsForObject setObject: roles forKey: uid];
{
[aclsForObject setObject: roles forKey: uid];
}
else
[aclsForObject removeObjectForKey: uid];
{
[aclsForObject removeObjectForKey: uid];
}
// We update our distributed cache
[[SOGoCache sharedCache] setACLs: aclsForObject
forPath: objectPath];
}
- (NSArray *) _realAclsForUser: (NSString *) uid
@@ -1501,7 +1509,7 @@ static NSArray *childRecordFields = nil;
NSDictionary *aclsForObject;
objectPath = [objectPathArray componentsJoinedByString: @"/"];
aclsForObject = [aclCache objectForKey: objectPath];
aclsForObject = [[SOGoCache sharedCache] aclsForPath: objectPath];
if (aclsForObject)
acls = [aclsForObject objectForKey: uid];
else
@@ -1571,9 +1579,13 @@ static NSArray *childRecordFields = nil;
}
}
objectPath = [objectPathArray componentsJoinedByString: @"/"];
aclsForObject = [aclCache objectForKey: objectPath];
aclsForObject = [[SOGoCache sharedCache] aclsForPath: objectPath];
if (aclsForObject)
[aclsForObject removeObjectsForKeys: usersAndGroups];
{
[aclsForObject removeObjectsForKeys: usersAndGroups];
[[SOGoCache sharedCache] setACLs: aclsForObject
forPath: objectPath];
}
uids = [usersAndGroups componentsJoinedByString: @"') OR (c_uid = '"];
qs = [NSString
stringWithFormat: @"(c_object = '/%@') AND ((c_uid = '%@'))",