Fix rendering of forwarded HTML message with img

Fixes #3981 (cont'd)
Alinto · Jan 13, 2017 · 4a21a02 · 4a21a02
1 parent 9d7d257
commit 4a21a02
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
@@ -840,6 +840,7 @@ - (void) _fetchFileAttachmentKey: (NSDictionary *) part
                                   path, @"path",
                                   [part objectForKey: @"encoding"], @"encoding",
                                   [part objectForKey:@ "size"], @"size",
+                                  [part objectForKey: @"bodyId"], @"bodyId",
                                   [NSString stringWithFormat: @"%@/%@", prefix, filenameURL], @"url",
                                   [NSString stringWithFormat: @"%@/asAttachment/%@", prefix, filenameURL], @"urlAsAttachment",
                                   nil];

diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -609,7 +609,8 @@ - (void) startElement: (NSString *) _localName
                   value = [_attributes valueAtIndex: count];
                   if ([value hasPrefix: @"cid:"])
                     {
-                      cid = [value substringFromIndex: 4];
+                      cid = [NSString stringWithFormat: @"<%@>",
+                             [value substringFromIndex: 4]];
                       value = [attachmentIds objectForKey: cid];
                       skipAttribute = (value == nil);
                     }

diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
@@ -215,15 +215,20 @@ - (id) contentViewerComponent
 
   NSMutableDictionary *attachmentIds;
   NSDictionary *attributes;
+  NSString *filename;
   unsigned int count, max;
 
   max = [[self attachmentAttrs] count];
   attachmentIds = [NSMutableDictionary dictionaryWithCapacity: max];
   for (count = 0; count < max; count++)
     {
       attributes = [[self attachmentAttrs] objectAtIndex: count];
+      filename = [NSString stringWithFormat: @"<%@>", [attributes objectForKey: @"filename"]];
       [attachmentIds setObject: [attributes objectForKey: @"url"]
-                        forKey: [attributes objectForKey: @"filename"]];
+                        forKey: filename];
+      if ([[attributes objectForKey: @"bodyId"] length])
+        [attachmentIds setObject: [attributes objectForKey: @"url"]
+                          forKey: [attributes objectForKey: @"bodyId"]];
     }
   [viewer setAttachmentIds: attachmentIds];