amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-18 14:44:53 +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
2010-06-02 16:42:49 +00:00
parent 64a0aa3d9c
commit 0a09a045c5
3 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUserFolder.m
+9 -17
View File
@@ -27,7 +27,6 @@
#import <NGObjWeb/NSException+HTTP.h>
#import <NGObjWeb/SoClassSecurityInfo.h>
#import <NGObjWeb/SoSecurityManager.h>
#import <NGObjWeb/WOApplication.h>
#import <NGObjWeb/WOContext+SoObjects.h>
#import <NGObjWeb/WORequest.h>
@@ -148,35 +147,28 @@
NSMutableArray *folders;
NSEnumerator *subfolders;
SOGoFolder *currentFolder;
NSString *folderName, *folderOwner;
NSString *folderName;
Class subfolderClass;
NSMutableDictionary *currentDictionary;
SoSecurityManager *securityManager;
folderOwner = [parentFolder ownerInContext: context];
securityManager = [SoSecurityManager sharedSecurityManager];
folders = [NSMutableArray array];
subfolderClass = [[parentFolder class] subFolderClass];
subfolders = [[parentFolder subFolders] objectEnumerator];
while ((currentFolder = [subfolders nextObject]))
{
if (![securityManager validatePermission: SOGoPerm_AccessObject
onObject: currentFolder inContext: context]
&& [[currentFolder ownerInContext: context]
isEqualToString: folderOwner]
&& [NSStringFromClass([currentFolder class]) compare: @"SOGoWebAppointmentFolder"] != NSOrderedSame)
if ([currentFolder isMemberOfClass: subfolderClass])
{
folderName = [NSString stringWithFormat: @"/%@/%@",
[parentFolder nameInContainer],
[currentFolder nameInContainer]];
currentDictionary
= [NSMutableDictionary dictionaryWithCapacity: 3];
currentDictionary = [NSMutableDictionary dictionaryWithCapacity: 4];
[currentDictionary setObject: [currentFolder displayName]
forKey: @"displayName"];
forKey: @"displayName"];
[currentDictionary setObject: folderName forKey: @"name"];
[currentDictionary setObject: folderOwner forKey: @"owner"];
[currentDictionary setObject: [currentFolder folderType]
forKey: @"type"];
forKey: @"type"];
[folders addObject: currentDictionary];
}
}
@@ -587,7 +579,7 @@
/* WebDAV */
- (NSArray *) fetchContentObjectNames
- (NSArray *) toOneRelationshipKeys
{
SOGoSystemDefaults *sd;
SOGoUser *currentUser;