Merge to 2.2.9

Alinto · Sep 26, 2014 · 7862cda · 7862cda
2 parents 3295520 + 4c5be2f
commit 7862cda
Show file tree

Hide file tree

Showing 183 changed files with 7,284 additions and 925 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ SoObjects/SOGo/derived_src/
 Tests/*/config.py
 *.pyc
 ._*
+Documentation/*.docbook
+Documentation/*.pdf
diff --git a/ActiveSync/NGMimeMessage+ActiveSync.m b/ActiveSync/NGMimeMessage+ActiveSync.m
@@ -33,28 +33,41 @@
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
+#import <NGMail/NGMailAddress.h>
+#import <NGMail/NGMailAddressParser.h>
+
 #import <SOGo/NSString+Utilities.h>
 
 @implementation NGMimeMessage (ActiveSync)
 
 - (NSArray *) allRecipients
 {
+  NSEnumerator *enumerator, *addressList;
   NSMutableArray *recipients;
-  NSEnumerator *enumerator;
+  NGMailAddressParser *parser;
+  NGMailAddress *address;
   NSString *s;
 
   recipients = [NSMutableArray array];
 
   enumerator = [[self headersForKey: @"to"] objectEnumerator];
   while ((s = [enumerator nextObject]))
     {
-      [recipients addObject: [s pureEMailAddress]];
+      parser = [NGMailAddressParser mailAddressParserWithString: s];
+      addressList = [[parser parseAddressList] objectEnumerator];
+
+      while ((address = [addressList nextObject]))
+        [recipients addObject: [address address]];
     }
 
   enumerator = [[self headersForKey: @"cc"] objectEnumerator];
   while ((s = [enumerator nextObject]))
     {
-      [recipients addObject: [s pureEMailAddress]];
+      parser = [NGMailAddressParser mailAddressParserWithString: s];
+      addressList = [[parser parseAddressList] objectEnumerator];
+
+      while ((address = [addressList nextObject]))
+        [recipients addObject: [address address]];
     }
 
   return recipients;

diff --git a/ActiveSync/NSString+ActiveSync.m b/ActiveSync/NSString+ActiveSync.m
@@ -63,8 +63,7 @@ - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 
   s = [self stringByEscapingHTMLString];
 
-  return [[s componentsSeparatedByCharactersInSet: [self safeCharacterSet]]
-                        componentsJoinedByString: @""];
+  return [s safeString];
 }
 
 - (int) activeSyncFolderType

diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m
@@ -236,7 +236,7 @@ - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
     {
       iCalAlarm *alarm;
 
-      alarm = [[self alarms] objectAtIndex: 0];
+      alarm = [self firstDisplayOrAudioAlarm];
       [s appendString: [alarm activeSyncRepresentationInContext: context]];
     }