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

See ChangeLog 

Monotone-Parent: d61deeadebd9f79f9603928dca395cad83167394
Monotone-Revision: 5d74c28ea0fcf5aa4d6ab7fc81f9bade5e4cfe5d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-12-09T19:41:28
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2010-12-09 19:41:28 +00:00
parent 5477457271
commit bfe5cfe5f9
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@
* SoObject/SOGo/SQLSource.m - added SHA password * SoObject/SOGo/SQLSource.m - added SHA password
hash support for SQL authentication sources. hash support for SQL authentication sources.
* Added patch from bug #1048 * Added patch from bug #1048
* SoObjects/Mailer/SOGoDraftObject.m:
-mimeHeaderMapWithHeaders:excluding: axed the "replyTo"
code as it was always 'empty', leading to Reply-To being
always set to the From: address, which is rather stupid.
2010-12-08 Francis Lachapelle <flachapelle@inverse.ca> 2010-12-08 Francis Lachapelle <flachapelle@inverse.ca>

12
SoObjects/Mailer/SOGoDraftObject.m
View File

@ -1283,8 +1283,8 @@ static NSString *userAgent = nil;
{ {
NSString *s, *dateString; NSString *s, *dateString;
NGMutableHashMap *map; NGMutableHashMap *map;
id from, replyTo;
NSArray *emails; NSArray *emails;
id from;
map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease]; map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease];
@ -1298,7 +1298,6 @@ static NSString *userAgent = nil;
/* add senders */ /* add senders */
from = [headers objectForKey: @"from"]; from = [headers objectForKey: @"from"];
replyTo = [headers objectForKey: @"replyTo"];
if (![self isEmptyValue:from]) { if (![self isEmptyValue:from]) {
if ([from isKindOfClass:[NSArray class]]) if ([from isKindOfClass:[NSArray class]])
@ -1306,15 +1305,6 @@ static NSString *userAgent = nil;
else else
[map setObject: [self _quoteSpecials: from] forKey: @"from"]; [map setObject: [self _quoteSpecials: from] forKey: @"from"];
} }
if (![self isEmptyValue: replyTo]) {
if ([from isKindOfClass:[NSArray class]])
[map setObjects: [self _quoteSpecialsInArray: from] forKey: @"reply-to"];
else
[map setObject: [self _quoteSpecials: from] forKey: @"reply-to"];
}
else if (![self isEmptyValue:from])
[map setObjects: [map objectsForKey: @"from"] forKey: @"reply-to"];
if (inReplyTo) if (inReplyTo)
[map setObject: inReplyTo forKey: @"in-reply-to"]; [map setObject: inReplyTo forKey: @"in-reply-to"];