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

Monotone-Parent: 6a3c0d744d66748f11759bba747978f5e50b85d5 

Monotone-Revision: 6c3973de5dad3f2478a806c7eb196f3a1a7d66a8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-07-20T18:50:12
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-07-20 18:50:12 +00:00
parent 3d698d0f91
commit 1585f25c2b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-07-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m (_subFoldersFromFolder:): we
need to validate the current user's access to the listed folders
again because of the recent changes on SOGoParentFolder.
* UI/Contacts/UIxContactFoldersView.m (_subFoldersFromFolder:):
removed unused method.

14
SoObjects/SOGo/SOGoUserFolder.m
View File

@ -27,6 +27,7 @@
#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>
@ -147,18 +148,27 @@
NSMutableArray *folders;
NSEnumerator *subfolders;
SOGoFolder *currentFolder;
NSString *folderName;
NSString *folderName, *folderOwner;
Class subfolderClass;
NSMutableDictionary *currentDictionary;
SoSecurityManager *securityManager;
folders = [NSMutableArray array];
folderOwner = [parentFolder ownerInContext: context];
securityManager = [SoSecurityManager sharedSecurityManager];
subfolderClass = [[parentFolder class] subFolderClass];
subfolders = [[parentFolder subFolders] objectEnumerator];
while ((currentFolder = [subfolders nextObject]))
{
if ([currentFolder isMemberOfClass: subfolderClass])
if (![securityManager validatePermission: SOGoPerm_AccessObject
onObject: currentFolder
inContext: context]
&& [[currentFolder ownerInContext: context]
isEqualToString: folderOwner]
&& [currentFolder isMemberOfClass: subfolderClass])
{
folderName = [NSString stringWithFormat: @"/%@/%@",
[parentFolder nameInContainer],