Monotone-Parent: 052f9de55b5ccfe5944c8d715ee190708be0140e
Monotone-Revision: 8268efeb15753e2949b09378244938f0b6bb08a8 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-09-29T18:26:29 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
49f320e49f
commit
7d81972309
|
@ -256,21 +256,6 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
return allErrors;
|
return allErrors;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (iCalCalendar *) calendarFromContent: (NSString *) cnt
|
|
||||||
{
|
|
||||||
iCalCalendar *calendar;
|
|
||||||
NSArray *calendars;
|
|
||||||
|
|
||||||
calendars = [CardGroup groupsOfClass: [iCalCalendar class]
|
|
||||||
fromSource: cnt];
|
|
||||||
if (calendars && [calendars count])
|
|
||||||
calendar = [calendars objectAtIndex: 0];
|
|
||||||
else
|
|
||||||
calendar = nil;
|
|
||||||
|
|
||||||
return calendar;
|
|
||||||
}
|
|
||||||
|
|
||||||
- (iCalEvent *) firstEventFromCalendar: (iCalCalendar *) calendar
|
- (iCalEvent *) firstEventFromCalendar: (iCalCalendar *) calendar
|
||||||
{
|
{
|
||||||
iCalEvent *event;
|
iCalEvent *event;
|
||||||
|
@ -338,7 +323,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
calendar = [self calendarFromContent: oldContent];
|
calendar = [iCalCalendar parseSingleFromSource: oldContent];
|
||||||
oldApt = [self firstEventFromCalendar: calendar];
|
oldApt = [self firstEventFromCalendar: calendar];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -351,7 +336,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
|
|
||||||
/* handle new content */
|
/* handle new content */
|
||||||
|
|
||||||
calendar = [self calendarFromContent: _iCal];
|
calendar = [iCalCalendar parseSingleFromSource: _iCal];
|
||||||
newApt = [self firstEventFromCalendar: calendar];
|
newApt = [self firstEventFromCalendar: calendar];
|
||||||
if (newApt == nil) {
|
if (newApt == nil) {
|
||||||
return [NSException exceptionWithHTTPStatus:400 /* Bad Request */
|
return [NSException exceptionWithHTTPStatus:400 /* Bad Request */
|
||||||
|
@ -488,7 +473,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
|
|
||||||
/* load existing content */
|
/* load existing content */
|
||||||
|
|
||||||
calendar = [self calendarFromContent: [self iCalString]];
|
calendar = [iCalCalendar parseSingleFromSource: [self iCalString]];
|
||||||
if (calendar)
|
if (calendar)
|
||||||
apt = [self firstEventFromCalendar: calendar];
|
apt = [self firstEventFromCalendar: calendar];
|
||||||
else
|
else
|
||||||
|
@ -541,7 +526,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||||
NSString *myEMail;
|
NSString *myEMail;
|
||||||
|
|
||||||
// TODO: do we need to use SOGoAppointment? (prefer iCalEvent?)
|
// TODO: do we need to use SOGoAppointment? (prefer iCalEvent?)
|
||||||
calendar = [self calendarFromContent: [self iCalString]];
|
calendar = [iCalCalendar parseSingleFromSource: [self iCalString]];
|
||||||
if (calendar)
|
if (calendar)
|
||||||
apt = [self firstEventFromCalendar: calendar];
|
apt = [self firstEventFromCalendar: calendar];
|
||||||
else
|
else
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include <SOGo/AgenorUserManager.h>
|
#include <SOGo/AgenorUserManager.h>
|
||||||
#include <NGCards/NGCards.h>
|
#include <NGCards/NGCards.h>
|
||||||
#include <NGCards/iCalRenderer.h>
|
|
||||||
|
|
||||||
@interface NSDate(UsedPrivates)
|
@interface NSDate(UsedPrivates)
|
||||||
- (NSString *)icalString; // declared in NGCards
|
- (NSString *)icalString; // declared in NGCards
|
||||||
|
@ -123,8 +122,9 @@
|
||||||
{
|
{
|
||||||
AgenorUserManager *um;
|
AgenorUserManager *um;
|
||||||
NSMutableString *ms;
|
NSMutableString *ms;
|
||||||
NSString *uid, *x;
|
NSString *uid;
|
||||||
unsigned i, count;
|
unsigned i, count;
|
||||||
|
iCalPerson *person;
|
||||||
|
|
||||||
um = [AgenorUserManager sharedUserManager];
|
um = [AgenorUserManager sharedUserManager];
|
||||||
uid = [[self container] login];
|
uid = [[self container] login];
|
||||||
|
@ -145,17 +145,9 @@
|
||||||
/* ORGANIZER - strictly required but missing for now */
|
/* ORGANIZER - strictly required but missing for now */
|
||||||
|
|
||||||
/* ATTENDEE */
|
/* ATTENDEE */
|
||||||
[ms appendString:@"ATTENDEE"];
|
person = [um iCalPersonWithUid: uid];
|
||||||
if ((x = [um getCNForUID:uid])) {
|
[person setTag: @"ATTENDEE"];
|
||||||
[ms appendString:@";CN=\""];
|
[ms appendString: [person versitString]];
|
||||||
[ms appendString:[x iCalDQUOTESafeString]];
|
|
||||||
[ms appendString:@"\""];
|
|
||||||
}
|
|
||||||
if ((x = [um getEmailForUID:uid])) {
|
|
||||||
[ms appendString:@":"]; /* sic! */
|
|
||||||
[ms appendString:[x iCalSafeString]];
|
|
||||||
}
|
|
||||||
[ms appendString:@"\r\n"];
|
|
||||||
|
|
||||||
/* DTSTART */
|
/* DTSTART */
|
||||||
[ms appendString:@"DTSTART:"];
|
[ms appendString:@"DTSTART:"];
|
||||||
|
|
|
@ -49,7 +49,6 @@
|
||||||
|
|
||||||
- (NGVCard *) vCard
|
- (NGVCard *) vCard
|
||||||
{
|
{
|
||||||
NSArray *cards;
|
|
||||||
NSString *contentStr;
|
NSString *contentStr;
|
||||||
|
|
||||||
if (!card)
|
if (!card)
|
||||||
|
@ -57,17 +56,14 @@
|
||||||
contentStr = [self contentAsString];
|
contentStr = [self contentAsString];
|
||||||
if ([contentStr hasPrefix:@"BEGIN:VCARD"])
|
if ([contentStr hasPrefix:@"BEGIN:VCARD"])
|
||||||
{
|
{
|
||||||
cards = [NGVCard parseVCardsFromSource: contentStr];
|
card = [NGVCard parseSingleFromSource: contentStr];
|
||||||
if ([cards count] > 0)
|
|
||||||
{
|
|
||||||
card = [cards objectAtIndex: 0];
|
|
||||||
[card retain];
|
[card retain];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
card = [NGVCard new];
|
card = [NGVCard new];
|
||||||
|
[card setTag: @"vcard"];
|
||||||
}
|
}
|
||||||
else
|
|
||||||
card = [NGVCard new];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return card;
|
return card;
|
||||||
|
|
|
@ -42,7 +42,7 @@ static NSString *SOGoUIDSeparator = @",";
|
||||||
/* accessors */
|
/* accessors */
|
||||||
|
|
||||||
- (NSArray *)unescapeURLComponents:(NSArray *)_parts {
|
- (NSArray *)unescapeURLComponents:(NSArray *)_parts {
|
||||||
#warning TODO: implement URL UID unescaping if necessary
|
// #warning TODO: implement URL UID unescaping if necessary
|
||||||
// TODO: who calls this for what?
|
// TODO: who calls this for what?
|
||||||
// Note: remember URL encoding!
|
// Note: remember URL encoding!
|
||||||
return _parts;
|
return _parts;
|
||||||
|
|
|
@ -91,12 +91,18 @@
|
||||||
return [[self folderManager] folderAtPath:_path];
|
return [[self folderManager] folderAtPath:_path];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (GCSFolder *)ocsFolder {
|
- (GCSFolder *) ocsFolder {
|
||||||
if (self->ocsFolder != nil)
|
GCSFolder *folder;
|
||||||
return [self->ocsFolder isNotNull] ? self->ocsFolder : nil;
|
|
||||||
|
|
||||||
self->ocsFolder = [[self ocsFolderForPath:[self ocsPath]] retain];
|
if (!ocsFolder)
|
||||||
return self->ocsFolder;
|
ocsFolder = [[self ocsFolderForPath:[self ocsPath]] retain];
|
||||||
|
|
||||||
|
if ([ocsFolder isNotNull])
|
||||||
|
folder = ocsFolder;
|
||||||
|
else
|
||||||
|
folder = nil;
|
||||||
|
|
||||||
|
return folder;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *)fetchContentObjectNames {
|
- (NSArray *)fetchContentObjectNames {
|
||||||
|
|
Loading…
Reference in a new issue