LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve handling of attachments names with quotes 

Partially resolves #2272
pull/210/head
Francis Lachapelle 2016-05-31 15:31:03 -04:00
parent ac229bacf6
commit 1dca078c56
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SoObjects/Mailer/SOGoDraftObject.m
View File

@ -1294,7 +1294,7 @@ static NSString *userAgent = nil;
{
s = [self mimeTypeForExtension:[_name pathExtension]];
if ([_name length] > 0)
s = [s stringByAppendingFormat: @"; name=\"%@\"", _name];
s = [s stringByAppendingFormat: @"; name=\"%@\"", [_name stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]];
}
return s;
@ -1320,7 +1320,7 @@ static NSString *userAgent = nil;
cdtype = @"attachment";
cd = [cdtype stringByAppendingString: @"; filename=\""];
cd = [cd stringByAppendingString: _name];
cd = [cd stringByAppendingString: [_name stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]];
cd = [cd stringByAppendingString: @"\""];
// TODO: add size parameter (useful addition, RFC 2183)

2
SoObjects/Mailer/SOGoMailObject.m
View File

@ -790,7 +790,7 @@ static BOOL debugSoParts = NO;
// See [UIxMailPartViewer _filenameForAttachment:]
filenameURL = [[filename stringByReplacingString: @"/" withString: @"-"] stringByEscapingURL];
currentFile = [NSDictionary dictionaryWithObjectsAndKeys:
filename, @"filename",
[filename stringByUnescapingURL], @"filename",
[mimeType lowercaseString], @"mimetype",
path, @"path",
[part objectForKey: @"encoding"], @"encoding",