amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-21 03:15:25 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 2cc377d2c23e8b670331c8dffc558d00e9cf7e62

Browse Source 
Monotone-Revision: d8a0de208631b406144e740ab09b4e5a92f0e66c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-25T20:56:14
This commit is contained in:
Wolfgang Sourdeau
2012-04-25 20:56:14 +00:00
parent 311dfb4c62
commit f7e9f2fc7d
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2012-04-25 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m
(-bodyPartForAttachmentWithName:): force conversion of rfc822
content to quoted-printable, since it would otherwise risk passing
8bit data via the "APPEND" command.
2012-04-24 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/SchedulerUI.js (updateCalendarStatus): if
SoObjects/Mailer/SOGoDraftObject.m
+19 -20
View File
@@ -1119,7 +1119,7 @@ static NSString *userAgent = nil;
NGMimeBodyPart *bodyPart;
NSString *s;
NSData *content;
BOOL attachAsString, is7bit;
BOOL attachAsString, force7bitText;
NSString *p;
id body;
@@ -1134,7 +1134,7 @@ static NSString *userAgent = nil;
return nil;
}
attachAsString = NO;
is7bit = NO;
force7bitText = NO;
/* prepare header of body part */
@@ -1145,7 +1145,7 @@ static NSString *userAgent = nil;
if ([s hasPrefix: @"text/plain"] || [s hasPrefix: @"text/html"])
attachAsString = YES;
else if ([s hasPrefix: @"message/rfc822"])
is7bit = YES;
force7bitText = YES;
}
if ((s = [self contentDispositionForAttachmentWithName:_name]))
{
@@ -1163,8 +1163,8 @@ static NSString *userAgent = nil;
content = [[NSData alloc] initWithContentsOfMappedFile:p];
s = [[NSString alloc] initWithData:content
encoding:[NSString defaultCStringEncoding]];
s = [[NSString alloc] initWithData: content
encoding: [NSString defaultCStringEncoding]];
if (s != nil) {
body = s;
[content release]; content = nil;
@@ -1176,16 +1176,6 @@ static NSString *userAgent = nil;
content = nil;
}
}
else if (is7bit) {
/*
Note: Apparently NGMimeFileData objects are not processed by the MIME
generator!
*/
body = [[NGMimeFileData alloc] initWithPath:p removeFile:NO];
[map setObject: @"7bit" forKey: @"content-transfer-encoding"];
[map setObject:[NSNumber numberWithInt:[body length]]
forKey: @"content-length"];
}
else {
/*
Note: in OGo this is done in LSWImapMailEditor.m:2477. Apparently
@@ -1194,12 +1184,21 @@ static NSString *userAgent = nil;
NSData *encoded;
content = [[NSData alloc] initWithContentsOfMappedFile:p];
encoded = [content dataByEncodingBase64];
[content release]; content = nil;
[map setObject: @"base64" forKey: @"content-transfer-encoding"];
if (force7bitText)
{
encoded = [content dataByEncodingQuotedPrintable];
[map setObject: @"quoted-printable"
forKey: @"content-transfer-encoding"];
}
else
{
encoded = [content dataByEncodingBase64];
[map setObject: @"base64" forKey: @"content-transfer-encoding"];
}
[map setObject:[NSNumber numberWithInt:[encoded length]]
forKey: @"content-length"];
[content release]; content = nil;
/* Note: the -init method will create a temporary file! */
body = [[NGMimeFileData alloc] initWithBytes:[encoded bytes]
@@ -1390,7 +1389,7 @@ static NSString *userAgent = nil;
[map setObject: [self _quoteSpecials: from] forKey: @"from"];
}
if (replyTo = [headers objectForKey: @"reply-to"])
if ((replyTo = [headers objectForKey: @"reply-to"]))
[map setObject: replyTo forKey: @"reply-to"];
if (inReplyTo)