merge of '4b9d34d20bce0208c3cf667d2c6e640fc0f7da7d'
and '84bd96711bb8cbccbe1b4ca017c6310b86d64421' Monotone-Parent: 4b9d34d20bce0208c3cf667d2c6e640fc0f7da7d Monotone-Parent: 84bd96711bb8cbccbe1b4ca017c6310b86d64421 Monotone-Revision: a1668784bf0e7d4c0f6537e4fd960651c40e912b Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-02-23T23:28:27 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
c497b03aa5
|
@ -1,5 +1,12 @@
|
||||||
2012-02-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2012-02-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* SoObjects/Appointments/SOGoCalendarComponent.m
|
||||||
|
(-sendEMailUsingTemplateNamed:forObject:previousObject:toAttendees:withType:):
|
||||||
|
added a "msgType" parameter that is added as value to the new
|
||||||
|
"x-sogo-message-type" header.
|
||||||
|
(-sendIMIPReplyForEvent:from:to:): added a "x-sogo-message-type"
|
||||||
|
to the headers.
|
||||||
|
|
||||||
* OpenChange/MAPIStoreMailContext.m
|
* OpenChange/MAPIStoreMailContext.m
|
||||||
(+listContextForUser:withTDBIndexing:inMemCtx:): make sure special
|
(+listContextForUser:withTDBIndexing:inMemCtx:): make sure special
|
||||||
folders have all the "folder" prefixes appended to their list of
|
folders have all the "folder" prefixes appended to their list of
|
||||||
|
|
|
@ -411,9 +411,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
[self sendEMailUsingTemplateNamed: @"Update"
|
[self sendEMailUsingTemplateNamed: @"Update"
|
||||||
forObject: [newEvent itipEntryWithMethod: @"request"]
|
forObject: [newEvent itipEntryWithMethod: @"request"]
|
||||||
previousObject: oldEvent
|
previousObject: oldEvent
|
||||||
toAttendees: updateAttendees];
|
toAttendees: updateAttendees
|
||||||
|
withType: @"calendar:invitation-update"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Update"
|
[self sendReceiptEmailUsingTemplateNamed: @"Update"
|
||||||
forObject: newEvent to: updateAttendees];
|
forObject: newEvent to: updateAttendees];
|
||||||
}
|
}
|
||||||
|
@ -573,7 +574,8 @@
|
||||||
[self sendEMailUsingTemplateNamed: @"Deletion"
|
[self sendEMailUsingTemplateNamed: @"Deletion"
|
||||||
forObject: [newEvent itipEntryWithMethod: @"cancel"]
|
forObject: [newEvent itipEntryWithMethod: @"cancel"]
|
||||||
previousObject: oldEvent
|
previousObject: oldEvent
|
||||||
toAttendees: attendees];
|
toAttendees: attendees
|
||||||
|
withType: @"calendar:cancellation"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Deletion"
|
[self sendReceiptEmailUsingTemplateNamed: @"Deletion"
|
||||||
forObject: newEvent to: attendees];
|
forObject: newEvent to: attendees];
|
||||||
}
|
}
|
||||||
|
@ -627,9 +629,10 @@
|
||||||
return ex;
|
return ex;
|
||||||
|
|
||||||
[self sendEMailUsingTemplateNamed: @"Invitation"
|
[self sendEMailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: [newEvent itipEntryWithMethod: @"request"]
|
forObject: [newEvent itipEntryWithMethod: @"request"]
|
||||||
previousObject: oldEvent
|
previousObject: oldEvent
|
||||||
toAttendees: attendees];
|
toAttendees: attendees
|
||||||
|
withType: @"calendar:invitation"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: newEvent to: attendees];
|
forObject: newEvent to: attendees];
|
||||||
}
|
}
|
||||||
|
@ -694,7 +697,8 @@
|
||||||
[self sendEMailUsingTemplateNamed: @"Invitation"
|
[self sendEMailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: [newEvent itipEntryWithMethod: @"request"]
|
forObject: [newEvent itipEntryWithMethod: @"request"]
|
||||||
previousObject: nil
|
previousObject: nil
|
||||||
toAttendees: attendees];
|
toAttendees: attendees
|
||||||
|
withType: @"calendar:invitation"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: newEvent to: attendees];
|
forObject: newEvent to: attendees];
|
||||||
}
|
}
|
||||||
|
@ -1001,7 +1005,8 @@
|
||||||
[self sendEMailUsingTemplateNamed: @"Deletion"
|
[self sendEMailUsingTemplateNamed: @"Deletion"
|
||||||
forObject: [event itipEntryWithMethod: @"cancel"]
|
forObject: [event itipEntryWithMethod: @"cancel"]
|
||||||
previousObject: nil
|
previousObject: nil
|
||||||
toAttendees: delegates];
|
toAttendees: delegates
|
||||||
|
withType: @"calendar:cancellation"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Deletion"
|
[self sendReceiptEmailUsingTemplateNamed: @"Deletion"
|
||||||
forObject: event
|
forObject: event
|
||||||
to: delegates];
|
to: delegates];
|
||||||
|
@ -1022,7 +1027,8 @@
|
||||||
[self sendEMailUsingTemplateNamed: @"Invitation"
|
[self sendEMailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: [event itipEntryWithMethod: @"request"]
|
forObject: [event itipEntryWithMethod: @"request"]
|
||||||
previousObject: nil
|
previousObject: nil
|
||||||
toAttendees: delegates];
|
toAttendees: delegates
|
||||||
|
withType: @"calendar:invitation"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: event to: delegates];
|
forObject: event to: delegates];
|
||||||
}
|
}
|
||||||
|
@ -1335,9 +1341,10 @@
|
||||||
[self _handleRemovedUsers: attendees
|
[self _handleRemovedUsers: attendees
|
||||||
withRecurrenceId: recurrenceId];
|
withRecurrenceId: recurrenceId];
|
||||||
[self sendEMailUsingTemplateNamed: @"Deletion"
|
[self sendEMailUsingTemplateNamed: @"Deletion"
|
||||||
forObject: [occurence itipEntryWithMethod: @"cancel"]
|
forObject: [occurence itipEntryWithMethod: @"cancel"]
|
||||||
previousObject: nil
|
previousObject: nil
|
||||||
toAttendees: attendees];
|
toAttendees: attendees
|
||||||
|
withType: @"calendar:cancellation"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Deletion"
|
[self sendReceiptEmailUsingTemplateNamed: @"Deletion"
|
||||||
forObject: occurence
|
forObject: occurence
|
||||||
to: attendees];
|
to: attendees];
|
||||||
|
@ -1667,9 +1674,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
[self sendEMailUsingTemplateNamed: @"Invitation"
|
[self sendEMailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: [event itipEntryWithMethod: @"request"]
|
forObject: [event itipEntryWithMethod: @"request"]
|
||||||
previousObject: nil
|
previousObject: nil
|
||||||
toAttendees: attendees];
|
toAttendees: attendees
|
||||||
|
withType: @"calendar:invitation"];
|
||||||
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
[self sendReceiptEmailUsingTemplateNamed: @"Invitation"
|
||||||
forObject: event to: attendees];
|
forObject: event to: attendees];
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,7 +67,8 @@
|
||||||
- (void) sendEMailUsingTemplateNamed: (NSString *) pageName
|
- (void) sendEMailUsingTemplateNamed: (NSString *) pageName
|
||||||
forObject: (iCalRepeatableEntityObject *) object
|
forObject: (iCalRepeatableEntityObject *) object
|
||||||
previousObject: (iCalRepeatableEntityObject *) previousObject
|
previousObject: (iCalRepeatableEntityObject *) previousObject
|
||||||
toAttendees: (NSArray *) attendees;
|
toAttendees: (NSArray *) attendees
|
||||||
|
withType: (NSString *) msgType;
|
||||||
- (void) sendIMIPReplyForEvent: (iCalRepeatableEntityObject *) event
|
- (void) sendIMIPReplyForEvent: (iCalRepeatableEntityObject *) event
|
||||||
from: (SOGoUser *) from
|
from: (SOGoUser *) from
|
||||||
to: (iCalPerson *) recipient;
|
to: (iCalPerson *) recipient;
|
||||||
|
|
|
@ -749,6 +749,7 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
|
||||||
forObject: (iCalRepeatableEntityObject *) object
|
forObject: (iCalRepeatableEntityObject *) object
|
||||||
previousObject: (iCalRepeatableEntityObject *) previousObject
|
previousObject: (iCalRepeatableEntityObject *) previousObject
|
||||||
toAttendees: (NSArray *) attendees
|
toAttendees: (NSArray *) attendees
|
||||||
|
withType: (NSString *) msgType
|
||||||
{
|
{
|
||||||
NSString *pageName;
|
NSString *pageName;
|
||||||
NSString *senderEmail, *shortSenderEmail, *email;
|
NSString *senderEmail, *shortSenderEmail, *email;
|
||||||
|
@ -844,6 +845,8 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
|
||||||
mailDate = [[NSCalendarDate date] rfc822DateString];
|
mailDate = [[NSCalendarDate date] rfc822DateString];
|
||||||
[headerMap setObject: mailDate forKey: @"date"];
|
[headerMap setObject: mailDate forKey: @"date"];
|
||||||
[headerMap setObject: subject forKey: @"subject"];
|
[headerMap setObject: subject forKey: @"subject"];
|
||||||
|
if ([msgType length] > 0)
|
||||||
|
[headerMap setObject: msgType forKey: @"x-sogo-message-type"];
|
||||||
msg = [NGMimeMessage messageWithHeader: headerMap];
|
msg = [NGMimeMessage messageWithHeader: headerMap];
|
||||||
|
|
||||||
/* multipart body */
|
/* multipart body */
|
||||||
|
@ -925,6 +928,7 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
|
||||||
forKey: @"subject"];
|
forKey: @"subject"];
|
||||||
[headerMap setObject: @"1.0" forKey: @"MIME-Version"];
|
[headerMap setObject: @"1.0" forKey: @"MIME-Version"];
|
||||||
[headerMap setObject: @"multipart/mixed" forKey: @"content-type"];
|
[headerMap setObject: @"multipart/mixed" forKey: @"content-type"];
|
||||||
|
[headerMap setObject: @"calendar:invitation-reply" forKey: @"x-sogo-message-type"];
|
||||||
msg = [NGMimeMessage messageWithHeader: headerMap];
|
msg = [NGMimeMessage messageWithHeader: headerMap];
|
||||||
|
|
||||||
/* multipart body */
|
/* multipart body */
|
||||||
|
|
Loading…
Reference in a new issue