amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

feat(mail): add options to not add X-Foward header in mail

Browse Source
This commit is contained in:
Hivert Quentin
2024-03-07 15:36:40 +01:00
parent 815a87de0b
commit 96331cac90
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoDraftObject.m
+6 -7
View File
@@ -1838,6 +1838,7 @@ static NSString *userAgent = nil;
NSString *s, *dateString;
NGMutableHashMap *map;
id emails, from, replyTo;
BOOL addXForward = NO;
map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease];
@@ -1884,16 +1885,14 @@ static NSString *userAgent = nil;
[map addObject: userAgent forKey: @"User-Agent"];
/* add custom headers */
if ([(s = [[context request] headerForKey:@"x-webobjects-remote-host"]) length] > 0 &&
addXForward = ![[[context activeUser] domainDefaults] mailDisableXForward];
if (addXForward && [(s = [[context request] headerForKey:@"x-webobjects-remote-host"]) length] > 0 &&
[s compare: @"localhost"] != NSOrderedSame)
[map addObject: s
forKey: @"X-Forward"];
[map addObject: s forKey: @"X-Forward"];
if ([(s = [headers objectForKey: @"X-Priority"]) length] > 0)
[map setObject: s
forKey: @"X-Priority"];
[map setObject: s forKey: @"X-Priority"];
if ([(s = [headers objectForKey: @"Disposition-Notification-To"]) length] > 0)
[map setObject: s
forKey: @"Disposition-Notification-To"];
[map setObject: s forKey: @"Disposition-Notification-To"];
[self _addHeaders: _headers toHeaderMap: map];