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

Alinto · Dec 29, 2016 · 239dffa · 239dffa
1 parent 6cd3d90
commit 239dffa
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/SoObjects/Contacts/SOGoContactEntryPhoto.m b/SoObjects/Contacts/SOGoContactEntryPhoto.m
@@ -40,25 +40,34 @@ - (NGVCardPhoto *) photo
 - (id) GETAction: (WOContext *) localContext
 {
   NGVCardPhoto *photo;
-  NSData     *data;
+  NSString *uri;
+  NSData *data;
   id response;
 
   photo = [self photo];
+  data = nil;
+  uri = nil;
+
   if ([photo isInline])
     data = [photo decodedContent];
-  else
-    data = [[photo flattenedValuesForKey: @""]
-             dataUsingEncoding: NSISOLatin1StringEncoding];
+  else if ([[photo value: 0 ofAttribute: @"value"] isEqualToString: @"uri"])
+    uri = [photo flattenedValuesForKey: @""];
+
   if (data)
     {
       response = [localContext response];
-
       [response setHeader: [self davContentType] forKey: @"content-type"];
       [response setHeader: [NSString stringWithFormat:@" %d",
                                      (int)[data length]]
                    forKey: @"content-length"];
       [response setContent: data];
     }
+  else if (uri)
+    {
+      response = [localContext response];
+      [response setStatus: 302];
+      [response setHeader: uri forKey: @"location"];
+    }
   else
     response = nil;