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

See ChangeLog

Browse Source 
Monotone-Parent: ed15d4f340fd47347d881c8826eb40a2dc22763d
Monotone-Revision: d669b0b3e321e22c68d092f984d543560ae1af0e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T20:01:34
This commit is contained in:
Francis Lachapelle
2012-01-12 20:01:34 +00:00
parent 335ba606b4
commit ccf847f555
19 changed files with 886 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MainUI/SOGoUserHomePage.m
+10 -8
View File
@@ -158,6 +158,7 @@
- (NSString *) _freeBusyFromStartDate: (NSCalendarDate *) startDate
toEndDate: (NSCalendarDate *) endDate
forFreeBusy: (SOGoFreeBusyObject *) fb
andUser: (NSString *) user
{
NSMutableArray *freeBusy;
unsigned int *freeBusyItems;
@@ -169,7 +170,7 @@
freeBusyItems = NSZoneCalloc (NULL, intervals, sizeof (int));
[self _fillFreeBusyItems: freeBusyItems count: intervals
withRecords: [fb fetchFreeBusyInfosFrom: startDate to: endDate]
withRecords: [fb fetchFreeBusyInfosFrom: startDate to: endDate forUser: user]
fromStartDate: startDate toEndDate: endDate];
freeBusy = [NSMutableArray arrayWithCapacity: intervals];
@@ -184,15 +185,16 @@
- (id <WOActionResults>) readFreeBusyAction
{
WOResponse *response;
SOGoFreeBusyObject *co;
SOGoFreeBusyObject *freebusy;
NSCalendarDate *startDate, *endDate;
NSString *queryDay;
NSString *queryDay, *uid;
NSTimeZone *uTZ;
SOGoUser *user;
user = [context activeUser];
uTZ = [[user userDefaults] timeZone];
uid = [self queryParameterForKey: @"uid"];
queryDay = [self queryParameterForKey: @"sday"];
if ([queryDay length] == 8)
{
@@ -211,13 +213,13 @@
andString: @"Start date is later than end date."];
else
{
co = [self clientObject];
freebusy = [self clientObject];
response
= [self responseWithStatus: 200
andString: [self
_freeBusyFromStartDate: startDate
toEndDate: endDate
forFreeBusy: co]];
andString: [self _freeBusyFromStartDate: startDate
toEndDate: endDate
forFreeBusy: freebusy
andUser: uid]];
}
}
else