amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-02 20:08:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: f9ec755c687fa482360d3b88e321382d4f3396f0

Browse Source 
Monotone-Revision: d0218fb78b87e5da11e31cb28a9ec3563699c62c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-22T15:13:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-08-22 15:13:06 +00:00
parent 4a521e3009
commit 66442caa3b
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2007-08-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
-fetchMailForForwarding:sourceMail]): check the user preference
for message forwarding and compose inline forwarded messages if required.
* SoObjects/Appointments/SOGoCalendarComponent.m
([SOGoCalendarComponent
-sendEMailUsingTemplateNamed:_pageNameforOldObject:_oldObjectandNewObject:_newObjecttoAttendees:_attendees]):

23
SoObjects/Mailer/SOGoDraftObject.m
View File

@@ -29,7 +29,7 @@
#import <NGObjWeb/NSException+HTTP.h>
#import <NGObjWeb/SoObject+SoDAV.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOContext+SoObjects.h>
#import <NGObjWeb/WORequest+So.h>
#import <NGObjWeb/WOResponse.h>
#import <NGExtensions/NGBase64Coding.h>
@@ -54,6 +54,7 @@
#import <SoObjects/SOGo/NSArray+Utilities.h>
#import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
#import <SoObjects/SOGo/SOGoMailer.h>
#import <SoObjects/SOGo/SOGoUser.h>
#import "SOGoMailAccount.h"
#import "SOGoMailFolder.h"
#import "SOGoMailObject.h"
@@ -517,6 +518,7 @@ static BOOL showTextAttachmentsInline = NO;
- (void) fetchMailForForwarding: (SOGoMailObject *) sourceMail
{
NSDictionary *info, *attachment;
SOGoUser *currentUser;
[sourceMail fetchCoreInfos];
@@ -527,15 +529,20 @@ static BOOL showTextAttachmentsInline = NO;
[self setSourceFlag: @"$Forwarded"];
/* attach message */
currentUser = [context activeUser];
if ([[currentUser messageForwarding] isEqualToString: @"inline"])
[self setText: [sourceMail contentForInlineForward]];
else
{
// TODO: use subject for filename?
// error = [newDraft saveAttachment:content withName:@"forward.mail"];
attachment = [NSDictionary dictionaryWithObjectsAndKeys:
[sourceMail filenameForForward], @"filename",
@"message/rfc822", @"mime-type",
nil];
[self saveAttachment: [sourceMail content]
withMetadata: attachment];
attachment = [NSDictionary dictionaryWithObjectsAndKeys:
[sourceMail filenameForForward], @"filename",
@"message/rfc822", @"mime-type",
nil];
[self saveAttachment: [sourceMail content]
withMetadata: attachment];
}
[self storeInfo];
}