Merge branch 'master' into feature-5726-gab-autocomplete

SoObjects/Contacts/NGVCard+SOGo.m

@@ -418,7 +418,7 @@ convention:
     [self setCategories: [o componentsSeparatedByString: @","]];
 
   // Photo
-  if ([ldifRecord objectForKey: @"photo"])
+  if ([ldifRecord objectForKey: @"photo"] && [ldifRecord objectForKey: @"photo"] != [NSNull null])
     [self setPhoto: [[ldifRecord objectForKey: @"photo"] stringByEncodingBase64]];
 
   [self cleanupEmptyChildren];

SoObjects/SOGo/NSString+Utilities.h

@@ -65,6 +65,7 @@
 - (id) objectFromJSONString;
 
 /* bare email addresses */
+- (NSString *) mailDomain;
 - (NSString *) pureEMailAddress;
 
 - (NSString *) asQPSubjectString: (NSString *) encoding;

SoObjects/SOGo/NSString+Utilities.m

@@ -609,6 +609,18 @@ static int cssEscapingCount;
   return newString;
 }
 
+
+- (NSString *) mailDomain
+{
+  NSArray *mailSeparated;
+
+  mailSeparated = [self componentsSeparatedByString: @"@"];
+  if([mailSeparated count] == 2)
+    return [mailSeparated objectAtIndex: 1];
+  [self logWithFormat: @"Error while extracting domain from : %@", self];
+  return nil;
+}
+
 - (NSString *) pureEMailAddress
 {
   NSString *pureAddress;

SoObjects/SOGo/SOGoDefaults.plist

@@ -123,6 +123,7 @@
     SOGoTemplatesFolderName = "Templates";
     SOGoMailComposeMessageType = "html";
     SOGoMailComposeFontSize = "0";
+    SOGoMailHideInlineAttachments = NO;
     SOGoMailDisplayRemoteInlineImages = "never";
     SOGoMailCertificateEnabled = YES;
 

SoObjects/SOGo/SOGoDomainDefaults.m

@@ -217,7 +217,7 @@
 
   v =  [self integerForKey: @"SOGoForwardConstraints"];
   
-  return (v > 2 ? 0 : v);
+  return (v > 3 ? 0 : v);
 }
 
 - (NSArray *) forwardConstraintsDomains

SoObjects/SOGo/SOGoGCSFolder.m

@@ -739,7 +739,8 @@ static NSArray *childRecordFields = nil;
         qualifier = aclQualifier;
 
       // For Thunderbird, disable contact list
-      if ([[context request] isThunderbird]) {
+      // This will be removed when VCARD will be implemented
+      if ([[context request] isThunderbird] && [self isKindOfClass: NSClassFromString(@"SOGoContactGCSFolder")]) {
         vlistExclusionQualifier = [EOQualifier qualifierWithQualifierFormat: @"c_component != 'vlist'"];
         qualifier = [[[EOAndQualifier alloc] initWithQualifiers:
                                                     vlistExclusionQualifier,
@@ -1191,7 +1192,8 @@ static NSArray *childRecordFields = nil;
   folder = [self ocsFolder];
 
   // For Thunderbird, disable contact list
-  if ([[context request] isThunderbird]) {
+  // This will be removed when VCARD will be implemented
+  if ([[context request] isThunderbird] && [self isKindOfClass: NSClassFromString(@"SOGoContactGCSFolder")]) {
     vlistExclusionQualifier = [EOQualifier qualifierWithQualifierFormat: @"c_component != 'vlist'"];
     qualifier = [[[EOAndQualifier alloc] initWithQualifiers:
                                                 vlistExclusionQualifier,