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

Monotone-Parent: 6eb7b1decc1399095693d1c51a865af87262f1de

Browse source 
Monotone-Revision: d58f9b1f1a39247ba47780a3deea01d36ebe1402

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-10T14:59:03
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2008-07-10 14:59:03 +00:00
parent 85a81bb9d0
commit d253589ee0
6 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-07-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
([SOGoCalendarComponent -sendResponseTo:recipient]): method
renamed from 'sendResponseToOrganizer' and which now takes an
optional argument indicating the recipient of the REPLY.
2008-07-09 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2008-07-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolders.m ([SOGoAppointmentFolders -davCreateCalendarCollection:newNameinContext:createContext]): * SoObjects/Appointments/SOGoAppointmentFolders.m ([SOGoAppointmentFolders -davCreateCalendarCollection:newNameinContext:createContext]):

6
SoObjects/Appointments/SOGoAppointmentObject.m
View file

@ -390,7 +390,7 @@
{ {
if ([[attendee rsvp] isEqualToString: @"true"] if ([[attendee rsvp] isEqualToString: @"true"]
&& [event isStillRelevant]) && [event isStillRelevant])
[self sendResponseToOrganizer]; [self sendResponseTo: nil];
organizerUID = [[event organizer] uid]; organizerUID = [[event organizer] uid];
if (organizerUID) if (organizerUID)
ex = [self _updateAttendee: attendee ex = [self _updateAttendee: attendee
@ -533,9 +533,7 @@
[recipientEvent takeAttendeeStatus: attendee]; [recipientEvent takeAttendeeStatus: attendee];
} }
#warning fix this when sendEmailUsing blabla has been cleaned up #warning fix this when sendEmailUsing blabla has been cleaned up
[self sendEMailUsingTemplateNamed: @"ICalReply" [self sendResponseTo: person];
forOldObject: nil andNewObject: event
toAttendees: [NSArray arrayWithObject: person]];
[person release]; [person release];
[elements [elements
addObject: [self _caldavSuccessCodeWithRecipient: recipient]]; addObject: [self _caldavSuccessCodeWithRecipient: recipient]];

2
SoObjects/Appointments/SOGoCalendarComponent.h
View file

@ -55,7 +55,7 @@
forOldObject: (iCalRepeatableEntityObject *) _oldObject forOldObject: (iCalRepeatableEntityObject *) _oldObject
andNewObject: (iCalRepeatableEntityObject *) _newObject andNewObject: (iCalRepeatableEntityObject *) _newObject
toAttendees: (NSArray *) _attendees; toAttendees: (NSArray *) _attendees;
- (void) sendResponseToOrganizer; - (void) sendResponseTo: (iCalPerson *) recipient;
// - (BOOL) isOrganizerOrOwner: (SOGoUser *) user; // - (BOOL) isOrganizerOrOwner: (SOGoUser *) user;

13
SoObjects/Appointments/SOGoCalendarComponent.m
View file

@ -373,11 +373,11 @@ static BOOL sendEMailNotifications = NO;
} }
} }
- (void) sendResponseToOrganizer - (void) sendResponseTo: (iCalPerson *) recipient
{ {
NSString *pageName, *language, *mailDate, *email; NSString *pageName, *language, *mailDate, *email;
WOApplication *app; WOApplication *app;
iCalPerson *organizer, *attendee; iCalPerson *attendee;
NSString *iCalString; NSString *iCalString;
iCalEvent *event; iCalEvent *event;
SOGoAptMailICalReply *p; SOGoAptMailICalReply *p;
@ -392,7 +392,8 @@ static BOOL sendEMailNotifications = NO;
event = [[self component: NO secure: NO] itipEntryWithMethod: @"reply"]; event = [[self component: NO secure: NO] itipEntryWithMethod: @"reply"];
if (![event userIsOrganizer: [context activeUser]]) if (![event userIsOrganizer: [context activeUser]])
{ {
organizer = [event organizer]; if (!recipient)
recipient = [event organizer];
attendee = [event findParticipant: [context activeUser]]; attendee = [event findParticipant: [context activeUser]];
[event setAttendees: [NSArray arrayWithObject: attendee]]; [event setAttendees: [NSArray arrayWithObject: attendee]];
@ -418,14 +419,14 @@ static BOOL sendEMailNotifications = NO;
*/ */
[headerMap setObject: @"multipart/mixed" forKey: @"content-type"]; [headerMap setObject: @"multipart/mixed" forKey: @"content-type"];
[headerMap setObject: [attendee mailAddress] forKey: @"from"]; [headerMap setObject: [attendee mailAddress] forKey: @"from"];
[headerMap setObject: [organizer mailAddress] forKey: @"to"]; [headerMap setObject: [recipient mailAddress] forKey: @"to"];
mailDate = [[NSCalendarDate date] rfc822DateString]; mailDate = [[NSCalendarDate date] rfc822DateString];
[headerMap setObject: mailDate forKey: @"date"]; [headerMap setObject: mailDate forKey: @"date"];
[headerMap setObject: [p getSubject] forKey: @"subject"]; [headerMap setObject: [p getSubject] forKey: @"subject"];
msg = [NGMimeMessage messageWithHeader: headerMap]; msg = [NGMimeMessage messageWithHeader: headerMap];
NSLog (@"sending 'REPLY' from %@ to %@", NSLog (@"sending 'REPLY' from %@ to %@",
[attendee mailAddress], [organizer mailAddress]); [attendee mailAddress], [recipient mailAddress]);
/* multipart body */ /* multipart body */
body = [[NGMimeMultipartBody alloc] initWithPart: msg]; body = [[NGMimeMultipartBody alloc] initWithPart: msg];
@ -457,7 +458,7 @@ static BOOL sendEMailNotifications = NO;
[body release]; [body release];
/* send the damn thing */ /* send the damn thing */
email = [organizer rfc822Email]; email = [recipient rfc822Email];
[[SOGoMailer sharedMailer] [[SOGoMailer sharedMailer]
sendMimePart: msg sendMimePart: msg
toRecipients: [NSArray arrayWithObject: email] toRecipients: [NSArray arrayWithObject: email]

1
SoObjects/Contacts/SOGoContactFolders.m
View file

@ -28,6 +28,7 @@
JournalItems IPF.Journal */ JournalItems IPF.Journal */
#import <Foundation/NSArray.h> #import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h> #import <Foundation/NSString.h>
#import <Foundation/NSEnumerator.h> #import <Foundation/NSEnumerator.h>

2
UI/MailPartViewers/UIxMailPartICalActions.m
View file

@ -217,7 +217,7 @@
rsvp = nil; rsvp = nil;
[eventObject saveContentString: [calendar versitString]]; [eventObject saveContentString: [calendar versitString]];
if ([rsvp isEqualToString: @"true"]) if ([rsvp isEqualToString: @"true"])
[eventObject sendResponseToOrganizer]; [eventObject sendResponseTo: nil];
organizerUID = [[chosenEvent organizer] uid]; organizerUID = [[chosenEvent organizer] uid];
if (organizerUID) if (organizerUID)
[self _updateAttendee: user withSequence: [chosenEvent sequence] [self _updateAttendee: user withSequence: [chosenEvent sequence]