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

Correctly handle the Active Sync requests

pull/17/head
Ludovic Marcotte 2014-01-10 14:10:16 -05:00
parent e21b30d768
commit 1d9febb511
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SoObjects/SOGo/SOGoUserFolder.h
View File

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2006-2013 Inverse inc. Copyright (C) 2006-2014 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of SOGo. This file is part of SOGo.
@ -40,6 +40,7 @@
@class NSDictionary; @class NSDictionary;
@class NSString; @class NSString;
@class WOContext; @class WOContext;
@class SOGoAppointmentFolders;
@class SOGoContactFolders; @class SOGoContactFolders;
@interface SOGoUserFolder : SOGoFolder @interface SOGoUserFolder : SOGoFolder
@ -60,6 +61,9 @@
- (BOOL) collectionDavKey: (NSString *) key - (BOOL) collectionDavKey: (NSString *) key
matches: (NSString *) value; matches: (NSString *) value;
- (SOGoAppointmentFolders *) privateCalendars: (NSString *) key
inContext: (WOContext *) localContext;
- (SOGoContactFolders *) privateContacts: (NSString *) _key - (SOGoContactFolders *) privateContacts: (NSString *) _key
inContext: (WOContext *) _ctx; inContext: (WOContext *) _ctx;

6
SoObjects/SOGo/WORequest+SOGo.m
View File

@ -1,8 +1,6 @@
/* WORequest+SOGo.m - this file is part of SOGo /* WORequest+SOGo.m - this file is part of SOGo
* *
* Copyright (C) 2007-2010 Inverse inc. * Copyright (C) 2007-2013 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* *
* This file is free software; you can redistribute it and/or modify * This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -37,7 +35,7 @@
- (BOOL) handledByDefaultHandler - (BOOL) handledByDefaultHandler
{ {
#warning this should be changed someday #warning this should be changed someday
return ![[self requestHandlerKey] isEqualToString:@"dav"]; return !([[self requestHandlerKey] isEqualToString: @"dav"] || [[self requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"]);
} }
- (NSArray *) _propertiesOfElement: (id <DOMElement>) startElement - (NSArray *) _propertiesOfElement: (id <DOMElement>) startElement