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

Monotone-Parent: 5c16103ef3144005637a40e62d21cf1830441cea

Browse Source 
Monotone-Revision: bbb9fd8c5076db6a340935f8f7dba98b04c5b353

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-06T20:32:20
This commit is contained in:
Wolfgang Sourdeau
2012-03-06 20:32:20 +00:00
parent b7323afa01
commit 165dd26ec5
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2012-03-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoMailFolder.m
(-archiveUIDs:inArchiveNamed:inContext:): output filename is now
escaped without its extension.
* SoObjects/Contacts/NGVCard+SOGo.m
(-_setupEmailFieldsInLDIFRecord:): simplified code and fixed a bug
where the home mail would be taken for both first and second email

14
SoObjects/Mailer/SOGoMailFolder.m
View File

@@ -468,7 +468,7 @@ static NSString *defaultUserID = @"anyone";
{
NSException *error;
NSFileManager *fm;
NSString *spoolPath, *fileName, *zipPath, *qpFileName;
NSString *spoolPath, *fileName, *baseName, *extension, *zipPath, *qpFileName;
NSDictionary *msgs;
NSArray *messages;
NSData *content, *zipContent;
@@ -533,7 +533,17 @@ static NSString *defaultUserID = @"anyone";
}
response = [context response];
qpFileName = [archiveName asQPSubjectString: @"utf-8"];
baseName = [archiveName stringByDeletingPathExtension];
extension = [archiveName pathExtension];
if ([extension length] > 0)
extension = [@"." stringByAppendingString: extension];
else
extension = @"";
qpFileName = [NSString stringWithFormat: @"%@%@",
[baseName asQPSubjectString: @"utf-8"],
extension];
[response setHeader: [NSString stringWithFormat: @"application/zip;"
@" name=\"%@\"",
qpFileName]