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

Monotone-Parent: 991fa5d50c1c078407d84332831b1f0c32190152

Browse Source 
Monotone-Revision: c37bbff8f7a0f029635c72cfa745ff24e2b2220c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-01-04T14:37:07
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-01-04 14:37:07 +00:00
parent 6e81fe733e
commit 7b8f76937c
6 changed files with 81 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
UI/Scheduler/UIxCalView.m
View File

@@ -440,30 +440,6 @@ static BOOL shouldDisplayWeekend = NO;
return [[self startDate] tomorrow];
}
- (SOGoAppointmentFolder *) calendarFolderForUID: (NSString *) uid
{
SOGoFolder *upperContainer;
SOGoUserFolder *userFolder;
SOGoAppointmentFolder *calendarFolder;
SoSecurityManager *securityManager;
upperContainer = [[[self clientObject] container] container];
userFolder = [SOGoUserFolder objectWithName: uid
inContainer: upperContainer];
calendarFolder = [SOGoAppointmentFolder objectWithName: @"Calendar"
inContainer: userFolder];
[calendarFolder
setOCSPath: [NSString stringWithFormat: @"/Users/%@/Calendar", uid]];
[calendarFolder setOwner: uid];
securityManager = [SoSecurityManager sharedSecurityManager];
return (([securityManager validatePermission: SoPerm_AccessContentsInformation
onObject: calendarFolder
inContext: context] == nil)
? calendarFolder : nil);
}
- (NSArray *) activeCalendarFolders
{
NSUserDefaults *ud;
@@ -471,6 +447,9 @@ static BOOL shouldDisplayWeekend = NO;
SOGoAppointmentFolder *currentFolder;
NSMutableArray *folders;
NSString *currentUID;
SoSecurityManager *securityManager;
securityManager = [SoSecurityManager sharedSecurityManager];
folders = [NSMutableArray array];
ud = [[context activeUser] userDefaults];
@@ -481,8 +460,11 @@ static BOOL shouldDisplayWeekend = NO;
{
if (![currentUID hasPrefix: @"-"])
{
currentFolder = [self calendarFolderForUID: currentUID];
if (currentFolder)
currentFolder = [[self clientObject] lookupCalendarFolderForUID: currentUID];
if (currentFolder
&& ![securityManager validatePermission: SoPerm_AccessContentsInformation
onObject: currentFolder
inContext: context])
[folders addObject: currentFolder];
}
currentUID = [calendarUIDs nextObject];