(fix) avoid appending the domain unconditionally when SOGoEnableDomainBasedUID is set to YES

NEWS

@@ -54,6 +54,7 @@ Bug fixes
  - now correctly handle multiple email addresses in the GAL over EAS (#3102)
  - now handle very large amount of participants correctly (#3175)
  - fix message bodies not shown on some EAS devices (#3173)
+ - avoid appending the domain unconditionally when SOGoEnableDomainBasedUID is set to YES
 
 2.2.17a (2015-03-15)
 --------------------

SoObjects/SOGo/SOGoUserFolder.m

@@ -427,7 +427,8 @@
         {
           currentUser = [users objectAtIndex: i];
           field = [currentUser objectForKey: @"c_uid"];
-          if (enableDomainBasedUID)
+          if (enableDomainBasedUID &&
+              [field rangeOfString: @"@"].location == NSNotFound)
             field = [NSString stringWithFormat: @"%@@%@", field, domain];
           if (![field isEqualToString: login])
             {

SoObjects/SOGo/SOGoUserManager.m

@@ -652,7 +652,8 @@ static Class NSNullK;
       // internal cache.
       [currentUser setObject: [newPassword asSHA1String] forKey: @"password"];
       sd = [SOGoSystemDefaults sharedSystemDefaults];
-      if ([sd enableDomainBasedUID])
+      if ([sd enableDomainBasedUID] &&
+          [login rangeOfString: @"@"].location == NSNotFound)
         userLogin = [NSString stringWithFormat: @"%@@%@", login, domain];
       else
         userLogin = login;

UI/MainUI/SOGoRootPage.m

@@ -228,7 +228,8 @@
       if ([domain isNotNull])
         {
           sd = [SOGoSystemDefaults sharedSystemDefaults];
-          if ([sd enableDomainBasedUID])
+          if ([sd enableDomainBasedUID] &&
+              [username rangeOfString: @"@"].location == NSNotFound)
             username = [NSString stringWithFormat: @"%@@%@", username, domain];
         }
 
@@ -587,7 +588,8 @@
       if ([domain isNotNull])
         {
           sd = [SOGoSystemDefaults sharedSystemDefaults];
-          if ([sd enableDomainBasedUID])
+          if ([sd enableDomainBasedUID] &&
+              [username rangeOfString: @"@"].location == NSNotFound)
             username = [NSString stringWithFormat: @"%@@%@", username, domain];
         }