See ChangeLog
Monotone-Parent: 51a6b06e57704b745079c66aae15d48bf3d2ac3d Monotone-Revision: a7388b1eb7856d57df84b1de0be0ed020317178c Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-10-20T13:15:22 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
fbd3da2093
commit
6927574d18
|
@ -1,3 +1,11 @@
|
|||
2009-10-20 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* Added missing timezones
|
||||
* SoObjects/SOGo/SOGoParentFolder.m:
|
||||
-davCreateCollection:inContext:
|
||||
We check, prior to creating the resource, if
|
||||
where we create it is a supported target.
|
||||
|
||||
2009-10-19 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/NSCalendarDate+SOGo.m: lower the values of
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Indianapolis
|
||||
X-LIC-LOCATION:America/Indiana/Indianapolis
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Knox
|
||||
X-LIC-LOCATION:America/Indiana/Knox
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0600
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:CDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0600
|
||||
TZNAME:CST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Marengo
|
||||
X-LIC-LOCATION:America/Indiana/Marengo
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Petersburg
|
||||
X-LIC-LOCATION:America/Indiana/Petersburg
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Tell_City
|
||||
X-LIC-LOCATION:America/Indiana/Tell_City
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0600
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:CDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0600
|
||||
TZNAME:CST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Vevay
|
||||
X-LIC-LOCATION:America/Indiana/Vevay
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Vincennes
|
||||
X-LIC-LOCATION:America/Indiana/Vincennes
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Indiana/Winamac
|
||||
X-LIC-LOCATION:America/Indiana/Winamac
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Kentucky/Louisville
|
||||
X-LIC-LOCATION:America/Kentucky/Louisville
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/Kentucky/Monticello
|
||||
X-LIC-LOCATION:America/Kentucky/Monticello
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0400
|
||||
TZNAME:EDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0400
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:EST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/North_Dakota/Center
|
||||
X-LIC-LOCATION:America/North_Dakota/Center
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0600
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:CDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0600
|
||||
TZNAME:CST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -0,0 +1,22 @@
|
|||
BEGIN:VCALENDAR
|
||||
PRODID:-//Inverse inc.//NONSGML SOGo//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VTIMEZONE
|
||||
TZID:/inverse.ca/20091015_1/America/North_Dakota/New_Salem
|
||||
X-LIC-LOCATION:America/North_Dakota/New_Salem
|
||||
BEGIN:DAYLIGHT
|
||||
TZOFFSETFROM:-0600
|
||||
TZOFFSETTO:-0500
|
||||
TZNAME:CDT
|
||||
DTSTART:19700308T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
|
||||
END:DAYLIGHT
|
||||
BEGIN:STANDARD
|
||||
TZOFFSETFROM:-0500
|
||||
TZOFFSETTO:-0600
|
||||
TZNAME:CST
|
||||
DTSTART:19701101T020000
|
||||
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
|
||||
END:STANDARD
|
||||
END:VTIMEZONE
|
||||
END:VCALENDAR
|
|
@ -20,6 +20,7 @@
|
|||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
#import <Foundation/NSString.h>
|
||||
|
@ -28,6 +29,7 @@
|
|||
#import <NGObjWeb/NSException+HTTP.h>
|
||||
#import <NGObjWeb/SoSecurityManager.h>
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGObjWeb/WOMessage.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
#import <GDLContentStore/GCSChannelManager.h>
|
||||
#import <GDLContentStore/GCSFolderManager.h>
|
||||
|
@ -452,6 +454,7 @@ static SoSecurityManager *sm = nil;
|
|||
|
||||
rc = NO;
|
||||
|
||||
#warning check error here
|
||||
error = [self initSubFolders];
|
||||
|
||||
subs = [subFolders allValues];
|
||||
|
@ -481,7 +484,76 @@ static SoSecurityManager *sm = nil;
|
|||
|
||||
- (NSException *) davCreateCollection: (NSString *) pathInfo
|
||||
inContext: (WOContext *) localContext
|
||||
{
|
||||
{
|
||||
id <DOMDocument> document;
|
||||
//
|
||||
// We check if we got a MKCOL with the addressbook resource on the
|
||||
// calendar-homeset collection (/Calendar). If so, we abort the
|
||||
// operation and return the proper error code.
|
||||
//
|
||||
// See http://tools.ietf.org/html/rfc5689 for all details.
|
||||
//
|
||||
document = [[localContext request] contentAsDOMDocument];
|
||||
|
||||
// If a payload was specified, lets get it in order to see
|
||||
// if we must accept or reject the MKCOL operation. If we
|
||||
// don't have any payload (what SOGo Connector / Integrators
|
||||
// sends right now), we proceed as before.
|
||||
if (document)
|
||||
{
|
||||
NSMutableArray *supportedTypes;
|
||||
id <DOMNodeList> children;
|
||||
DOMElement *element;
|
||||
NSException *error;
|
||||
NSArray *allTypes;
|
||||
id o;
|
||||
|
||||
BOOL supported;
|
||||
int i;
|
||||
|
||||
error = [self initSubFolders];
|
||||
supported = YES;
|
||||
|
||||
if (error)
|
||||
{
|
||||
[self errorWithFormat: @"a database error occured: %@", [error reason]];
|
||||
return [NSException exceptionWithHTTPStatus: 503];
|
||||
}
|
||||
|
||||
// We assume "personal" exists. In fact, if it doesn't, something
|
||||
// is seriously broken.
|
||||
allTypes = [[subFolders objectForKey: @"personal"] davResourceType];
|
||||
supportedTypes = [NSMutableArray array];
|
||||
|
||||
for (i = 0; i < [allTypes count]; i++)
|
||||
{
|
||||
o = [allTypes objectAtIndex: i];
|
||||
if ([o isKindOfClass: [NSArray class]])
|
||||
o = [o objectAtIndex: 0];
|
||||
|
||||
[supportedTypes addObject: o];
|
||||
}
|
||||
|
||||
children = [[(NSArray *)[[document documentElement] getElementsByTagName: @"resourcetype"]
|
||||
lastObject] childNodes];
|
||||
|
||||
// We check if all the provided types are supported.
|
||||
// In case one of them is not, we reject the operation.
|
||||
for (i = 0; i < [children length]; i++)
|
||||
{
|
||||
element = [children objectAtIndex: i];
|
||||
|
||||
if ([element nodeType] == DOM_ELEMENT_NODE &&
|
||||
![supportedTypes containsObject: [element nodeName]])
|
||||
supported = NO;
|
||||
}
|
||||
|
||||
if (!supported)
|
||||
{
|
||||
return [NSException exceptionWithHTTPStatus: 403];
|
||||
}
|
||||
}
|
||||
|
||||
return [self newFolderWithName: pathInfo
|
||||
andNameInContainer: pathInfo];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
This package was debianized by Cyril <support@inverse.ca> on
|
||||
This package was debianized by Inverse <support@inverse.ca> on
|
||||
Mon, 27 Jul 2009 10:57:51 -0400.
|
||||
|
||||
It was downloaded from http://www.scalableogo.org/fr/downloads/backend.html
|
||||
|
@ -6,11 +6,9 @@ It was downloaded from http://www.scalableogo.org/fr/downloads/backend.html
|
|||
Upstream Authors:
|
||||
|
||||
Inverse inc. <support@inverse.ca>
|
||||
Skyric AG <sales@skyrix.com>
|
||||
|
||||
Copyright:
|
||||
|
||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||
Copyright (C) 2006-2009 Inverse inc.
|
||||
|
||||
License:
|
||||
|
@ -29,5 +27,5 @@ License:
|
|||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
The Debian packaging is (C) 2009, Cyril <support@inverse.ca> and
|
||||
The Debian packaging is (c) 2009, Inverse <support@inverse.ca> and
|
||||
is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
|
||||
|
|
Loading…
Reference in New Issue