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

See Changelog. 

Monotone-Parent: a42c5d851619b9189a0c4a611c29eba535c00e93
Monotone-Revision: ccb49b853f2059fd3133a0ab1c7e4f79f4b87c23

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-10-28T13:52:02
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-10-28 13:52:02 +00:00
parent ee939e315d
commit e2ce30b69d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-10-28 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m
(-mimeHeaderMapWithHeaders:excluding:): added the X-Forward header
with the user's IP address, if available and not equal to 'localhost'.
2010-10-27 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Contacts/UIxContactView.m (-categories): new accessor for

6
SoObjects/Mailer/SOGoDraftObject.m
View File

@ -1285,7 +1285,6 @@ static NSString *userAgent = nil;
map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease];
/* add recipients */
if ((emails = [headers objectForKey: @"to"]) != nil)
[map setObjects: [self _quoteSpecialsInArray: emails] forKey: @"to"];
if ((emails = [headers objectForKey: @"cc"]) != nil)
@ -1294,7 +1293,6 @@ static NSString *userAgent = nil;
[map setObjects: [self _quoteSpecialsInArray: emails] forKey: @"bcc"];
/* add senders */
from = [headers objectForKey: @"from"];
replyTo = [headers objectForKey: @"replyTo"];
@ -1332,6 +1330,10 @@ static NSString *userAgent = nil;
[map addObject: userAgent forKey: @"User-Agent"];
/* add custom headers */
if ([(s = [[context request] headerForKey:@"x-webobjects-remote-host"]) length] > 0 &&
[s compare: @"localhost"] != NSOrderedSame)
[map addObject: s
forKey: @"X-Forward"];
if ([(s = [headers objectForKey: @"X-Priority"]) length] > 0)
[map setObject: s
forKey: @"X-Priority"];