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

Monotone-Parent: 0c6806493b569c14269ce32c78f49e2d8d0bd053

Browse Source 
Monotone-Revision: 45a909a97ed4304fcd6107fccb0e129e9db8d87a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-02T16:42:49
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2010-06-02 16:42:49 +00:00
1 parent 64a0aa3d9c
commit 0a09a045c5
3 files changed
+39 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/SOGo/SOGoParentFolder.m
+19 -12
View File
@@ -175,10 +175,12 @@ static SoSecurityManager *sm = nil;
{
NSArray *attrs;
NSDictionary *row;
BOOL hasPersonal;
BOOL hasPersonal, ignoreRights;
SOGoGCSFolder *folder;
NSString *key;
NSString *key, *login;
NSException *error;
SOGoUser *currentUser;
SoSecurityManager *securityManager;
if (!subFolderClass)
subFolderClass = [[self class] subFolderClass];
@@ -187,23 +189,33 @@ static SoSecurityManager *sm = nil;
error = [fc evaluateExpressionX: sql];
if (!error)
{
currentUser = [context activeUser];
login = [currentUser login];
ignoreRights = (activeUserIsOwner || [login isEqualToString: owner]
|| [currentUser isSuperUser]);
if (!ignoreRights)
securityManager = [SoSecurityManager sharedSecurityManager];
attrs = [fc describeResults: NO];
row = [fc fetchAttributes: attrs withZone: NULL];
while (row)
while ((row = [fc fetchAttributes: attrs withZone: NULL]))
{
key = [row objectForKey: @"c_path4"];
if ([key isKindOfClass: [NSString class]])
{
folder = [subFolderClass objectWithName: key inContainer: self];
hasPersonal = (hasPersonal || [key isEqualToString: @"personal"]);
hasPersonal = (hasPersonal
|| [key isEqualToString: @"personal"]);
[folder setOCSPath: [NSString stringWithFormat: @"%@/%@",
OCSPath, key]];
if (ignoreRights
|| ![securityManager validatePermission: SOGoPerm_AccessObject
onObject: folder
inContext: context])
[subFolders setObject: folder forKey: key];
}
row = [fc fetchAttributes: attrs withZone: NULL];
}
if (!hasPersonal)
if (ignoreRights && !hasPersonal)
[self _createPersonalFolder];
}
@@ -382,11 +394,6 @@ static SoSecurityManager *sm = nil;
return error;
}
- (NSArray *) fetchContentObjectNames
{
return nil;
}
- (id) lookupName: (NSString *) name
inContext: (WOContext *) lookupContext
acquire: (BOOL) acquire