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

Merge pull request #99 from Zentyal/ejhernandez/corner-cases-import-PST

Browse Source 
oc-mail: Set sender on email messages without an orig recipient
This commit is contained in:
Jesús García Sáez
2015-03-11 13:08:33 +01:00
parent 8031f066dc 44dfd35521
commit 307fe90854
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenChange/MAPIStoreMailVolatileMessage.m
View File

@@ -610,6 +610,7 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
NSDictionary *mailProperties, BOOL withBcc,
struct mapistore_connection_info *connInfo)
{
BOOL fromResolved = NO;
NSData *senderEntryId;
NSMutableString *subject;
NSString *from, *recId, *messageId, *subjectData, *recipientsStr, *msgClass;
@@ -646,13 +647,15 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
list = MakeRecipientsList ([recipients objectForKey: @"orig"]);
if ([list count])
[headers setObjects: list forKey: @"from"];
{
[headers setObjects: list forKey: @"from"];
fromResolved = YES;
}
}
else
if (!fromResolved)
{
NSLog (@"Message without recipients."
@"Guessing recipients from PidTagSenderEntryId, PidTagOriginalDisplayTo"
@"and PidTagOriginalCc");
NSLog (@"Message without an orig from, try to guess it from PidTagSenderEntryId");
senderEntryId = [mailProperties objectForKey: MAPIPropertyKey (PR_SENDER_ENTRYID)];
if (senderEntryId)
{
@@ -712,7 +715,12 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
}
}
}
if (!recipients)
{
NSLog (@"Message without recipients."
@"Guessing recipients from PidTagOriginalDisplayTo and PidTagOriginalCc");
recipientsStr = [mailProperties objectForKey: MAPIPropertyKey (PidTagOriginalDisplayTo)];
if (recipientsStr)
{