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

merge of '73f3fa811c59b152f7c426fe28488efd6bcfe6f2'

Browse Source 
and '83c63e63da91d2b44db08849dc570ff2029ed74a'

Monotone-Parent: 73f3fa811c59b152f7c426fe28488efd6bcfe6f2
Monotone-Parent: 83c63e63da91d2b44db08849dc570ff2029ed74a
Monotone-Revision: fc4c1f1be84a58e494d27f5885576e38eeb809ba

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-24T15:09:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-03-24 15:09:21 +00:00
parent 14ad710630 c9c3226988
commit b1fd5e86f8
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2010-03-22 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m - we strip
the bcc header prior to sending mails.
2010-03-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m

30
SoObjects/Mailer/SOGoDraftObject.m
View File

@@ -1211,11 +1211,12 @@ static NSString *userAgent = @"SOGoMail 1.0";
}
- (NGMutableHashMap *) mimeHeaderMapWithHeaders: (NSDictionary *) _headers
excluding: (NSArray *) _exclude
{
NSString *s, *dateString;
NGMutableHashMap *map;
NSArray *emails;
NSString *s, *dateString;
id from, replyTo;
id from, replyTo;
NSArray *emails;
map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease];
@@ -1273,10 +1274,20 @@ static NSString *userAgent = @"SOGoMail 1.0";
[self _addHeaders: _headers toHeaderMap: map];
// We remove what we have to...
if (_exclude)
{
int i;
for (i = 0; i < [_exclude count]; i++)
[map removeAllObjectsForKey: [_exclude objectAtIndex: i]];
}
return map;
}
- (NGMimeMessage *) mimeMessageWithHeaders: (NSDictionary *) _headers
excluding: (NSArray *) _exclude
{
NGMutableHashMap *map;
NSArray *bodyParts;
@@ -1284,7 +1295,8 @@ static NSString *userAgent = @"SOGoMail 1.0";
message = nil;
map = [self mimeHeaderMapWithHeaders: _headers];
map = [self mimeHeaderMapWithHeaders: _headers
excluding: _exclude];
if (map)
{
[self debugWithFormat: @"MIME Envelope: %@", map];
@@ -1313,7 +1325,7 @@ static NSString *userAgent = @"SOGoMail 1.0";
- (NGMimeMessage *) mimeMessage
{
return [self mimeMessageWithHeaders: nil];
return [self mimeMessageWithHeaders: nil excluding: nil];
}
- (NSData *) mimeMessageAsData
@@ -1376,7 +1388,13 @@ static NSString *userAgent = @"SOGoMail 1.0";
error = (NSException *) sentFolder;
else
{
message = [self mimeMessageAsData];
// We strip the BCC fields prior sending any mails
NGMimeMessageGenerator *generator;
generator = [[[NGMimeMessageGenerator alloc] init] autorelease];
message = [generator generateMimeFromPart: [self mimeMessageWithHeaders: nil
excluding: [NSArray arrayWithObject: @"bcc"]]];
dd = [[context activeUser] domainDefaults];
error = [[SOGoMailer mailerWithDomainDefaults: dd]
sendMailData: message