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

Monotone-Parent: 73611f6bef70fd39e1aa66a4aae311b19f594980

Browse Source 
Monotone-Revision: 2fb05a09608f9836ad74855b6a11b662b983d5a0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-10T21:15:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-12-10 21:15:32 +00:00
parent d1a05ac86c
commit 912b9d1c04
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
UI/MailPartViewers/UIxMailPartHTMLViewer.m
View File

@@ -432,17 +432,26 @@
andBaseURL: (NSString *) url
intoDictionary: (NSMutableDictionary *) attachmentIds
{
NSString *bodyId;
NSString *bodyId, *filename;
NSMutableString *attachmentURL;
bodyId = [part objectForKey: @"bodyId"];
if ([bodyId length] > 0)
{
filename = [[part objectForKey: @"parameterList"] objectForKey: @"name"];
if (!filename)
filename = [[[part objectForKey: @"disposition"]
objectForKey: @"parameterList"]
objectForKey: @"filename"];
if ([bodyId hasPrefix: @"<"])
bodyId = [bodyId substringFromIndex: 1];
if ([bodyId hasSuffix: @">"])
bodyId = [bodyId substringToIndex: [bodyId length] - 1];
[attachmentIds setObject: [url stringByAppendingFormat: @"/%d", count]
forKey: bodyId];
attachmentURL = [NSMutableString stringWithString: url];
[attachmentURL appendFormat: @"/%d", count];
if ([filename length])
[attachmentURL appendFormat: @"/%@", filename];
[attachmentIds setObject: attachmentURL forKey: bodyId];
}
}
@@ -451,7 +460,7 @@
NSMutableDictionary *attachmentIds;
UIxMailPartViewer *parent;
unsigned int count, max;
NSMutableString *url;
// NSMutableString *url;
NSString *baseURL;
NSArray *parts;
@@ -463,18 +472,18 @@
isEqualToString: @"UIxMailPartAlternativeViewer"])
{
baseURL = [[self clientObject] baseURLInContext: context];
url = [NSMutableString new];
[url appendString: baseURL];
[url appendFormat: @"/%@", [partPath componentsJoinedByString: @"/"]];
[url deleteCharactersInRange: NSMakeRange([url length] - 2, 2)];
parts = [[parent bodyInfo] objectForKey: @"parts"];
// url = [NSMutableString new];
// [url appendString: baseURL];
// [url appendFormat: @"/%@", [partPath componentsJoinedByString: @"/"]];
// [url deleteCharactersInRange: NSMakeRange([url length] - 4, 4)];
parts = [[[parent parent] bodyInfo] objectForKey: @"parts"];
max = [parts count];
for (count = 0; count < max; count++)
[self _convertReferencesForPart: [parts objectAtIndex: count]
withCount: count + 1
andBaseURL: url
andBaseURL: baseURL
intoDictionary: attachmentIds];
[url release];
// [url release];
}
return attachmentIds;