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

(fix) handle URI in vCard photos (fixes #2683)

Browse source
This commit is contained in:
Ludovic Marcotte 2016-12-29 14:35:06 -05:00
parent 6cd3d90410
commit 239dffa391
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SoObjects/Contacts/SOGoContactEntryPhoto.m
View file

@ -40,25 +40,34 @@
- (id) GETAction: (WOContext *) localContext - (id) GETAction: (WOContext *) localContext
{ {
NGVCardPhoto *photo; NGVCardPhoto *photo;
NSString *uri;
NSData *data; NSData *data;
id response; id response;
photo = [self photo]; photo = [self photo];
data = nil;
uri = nil;
if ([photo isInline]) if ([photo isInline])
data = [photo decodedContent]; data = [photo decodedContent];
else else if ([[photo value: 0 ofAttribute: @"value"] isEqualToString: @"uri"])
data = [[photo flattenedValuesForKey: @""] uri = [photo flattenedValuesForKey: @""];
dataUsingEncoding: NSISOLatin1StringEncoding];
if (data) if (data)
{ {
response = [localContext response]; response = [localContext response];
[response setHeader: [self davContentType] forKey: @"content-type"]; [response setHeader: [self davContentType] forKey: @"content-type"];
[response setHeader: [NSString stringWithFormat:@" %d", [response setHeader: [NSString stringWithFormat:@" %d",
(int)[data length]] (int)[data length]]
forKey: @"content-length"]; forKey: @"content-length"];
[response setContent: data]; [response setContent: data];
} }
else if (uri)
{
response = [localContext response];
[response setStatus: 302];
[response setHeader: uri forKey: @"location"];
}
else else
response = nil; response = nil;