Monotone-Parent: ffb403989e64c7ca37321c15ab24b50155dc2f68

Monotone-Revision: fe50cf1e82dc1e3027fc400eb2f405261b9ad9f3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-21T21:17:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2009-10-21 21:17:11 +00:00
1 parent 98a48a1c53
commit 8bbe631dac
16 files changed
+217 -34

No files matched your search

+26 -6
View File
@@ -46,6 +46,7 @@
#import <NGCards/iCalDateTime.h>
#import <NGCards/iCalPerson.h>
#import <NGCards/iCalRecurrenceCalculator.h>
#import <NGCards/iCalTimeZone.h>
#import <NGCards/NSString+NGCards.h>
#import <NGExtensions/NGCalendarDateRange.h>
#import <NGExtensions/NSNull+misc.h>
@@ -1674,6 +1675,24 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
- (NSException *) setDavCalendarOrder: (NSString *) newColor
{
/* we fail silently */
return nil;
}
- (NSString *) davCalendarTimeZone
{
SOGoUser *ownerUser;
NSString *ownerTimeZone;
ownerUser = [SOGoUser userWithLogin: [self ownerInContext: context]];
ownerTimeZone = [[ownerUser timeZone] name];
return [[iCalTimeZone timeZoneForName: ownerTimeZone] versitString];
}
- (NSException *) setDavCalendarTimeZone: (NSString *) newTimeZone
{
/* we fail silently */
return nil;
}
@@ -1687,8 +1706,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
response = [NSMutableArray array];
subFolders = [[container subFolders] objectEnumerator];
while ((currentFolder = [subFolders nextObject]))
[response addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
[currentFolder davURL])];
[response
addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
[currentFolder davURLAsString])];
responseValue = [davElementWithContent (@"calendar-free-busy-set", XMLNS_CALDAV, response)
asWebDAVValue];
@@ -1720,7 +1740,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
while ((currentField = [addFields nextObject]))
if ([currentField length])
[fields addObjectUniquely: currentField];
baseURL = [[self davURL] absoluteString];
baseURL = [self davURLAsString];
propertiesArray = [[properties allKeys] asPointersOfObjects];
propertiesCount = [properties count];
@@ -1813,7 +1833,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
max = [urls count];
cNames = [NSMutableDictionary dictionaryWithCapacity: max];
baseURL = [self davURL];
baseURLString = [baseURL absoluteString];
baseURLString = [self davURLAsString];
for (count = 0; count < max; count++)
{
@@ -1939,7 +1959,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
unsigned int count, max, propertiesCount;
NSEnumerator *addFields;
baseURL = [[self davURL] absoluteString];
baseURL = [self davURLAsString];
urls = [NSMutableArray array];
max = [refs length];
@@ -2358,7 +2378,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
resourcetype. Anything else will prevent the iPhone from querying the
collection. */
request = [context request];
if (![request isIPhone])
if (!([request isIPhone] || [request isICal4]))
{
gdRT = [self groupDavResourceType];
gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
@@ -35,6 +35,8 @@
#import <SOGo/NSObject+DAV.h>
#import <SOGo/NSString+DAV.h>
#import <SOGo/WORequest+SOGo.h>
#import "SOGoAppointmentFolders.h"
#import "SOGoUserFolder+Appointments.h"
@@ -88,7 +90,7 @@
parent = [self privateCalendars: @"Calendar" inContext: context];
tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
[[parent davURL] path], nil];
[parent davURLAsString], nil];
return [NSArray arrayWithObject: tag];
}
@@ -100,7 +102,8 @@
parent = [self privateCalendars: @"Calendar" inContext: context];
tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
[NSString stringWithFormat: @"%@personal/", [[parent davURL] path]],
[NSString stringWithFormat: @"%@personal/",
[parent davURLAsString]],
nil];
return [NSArray arrayWithObject: tag];
@@ -108,22 +111,50 @@
- (NSArray *) davCalendarScheduleInboxURL
{
return [self _davPersonalCalendarURL];
NSArray *url;
if ([[context request] isICal4])
url = nil;
else
url = [self _davPersonalCalendarURL];
return url;
}
- (NSArray *) davCalendarScheduleOutboxURL
{
return [self _davPersonalCalendarURL];
NSArray *url;
if ([[context request] isICal4])
url = nil;
else
url = [self _davPersonalCalendarURL];
return url;
}
- (NSArray *) davDropboxHomeURL
{
return [self _davPersonalCalendarURL];
NSArray *url;
if ([[context request] isICal4])
url = nil;
else
url = [self _davPersonalCalendarURL];
return url;
}
- (NSArray *) davNotificationsURL
{
return [self _davPersonalCalendarURL];
NSArray *url;
if ([[context request] isICal4])
url = nil;
else
url = [self _davPersonalCalendarURL];
return url;
}
- (WOResponse *) _prepareResponseFromContext: (WOContext *) queryContext
@@ -329,7 +360,7 @@
response = [NSMutableArray array];
[response addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
[collection davURL])];
[collection davURLAsString])];
props = [NSMutableArray array];
max = [properties count];
for (count = 0; count < max; count++)