Revert "Revert "(fix) more fixes and clarifications on the mutli-domain settings""

This reverts commit 3dd8bddc0e.

SoObjects/SOGo/SOGoUser.m

@@ -165,8 +165,9 @@
               // The domain is probably appended to the username;
               // make sure it is defined as a domain in the configuration.
               domain = [newLogin substringFromIndex: (r.location + r.length)];
-              if (![[sd domainIds] containsObject: domain])
-                domain = nil;
+              if ([[sd domainIds] containsObject: domain] &&
+                  ![sd enableDomainBasedUID])
+                newLogin = [newLogin substringToIndex: r.location];
 
               if (domain != nil && ![sd enableDomainBasedUID])
                 // Login domains are enabled (SOGoLoginDomains) but not

SoObjects/SOGo/SOGoUserManager.m

@@ -524,21 +524,9 @@ static Class NSNullK;
 
       if (r.location != NSNotFound)
         {
-          NSArray *allDomains;
-          int i;
-
           *_domain = [username substringFromIndex: r.location+1];
 
-          allDomains = [[dd dictionaryForKey: @"domains"] allValues];
-
-          for (i = 0; i < [allDomains count]; i++)
-            {
-              if ([*_domain isEqualToString: [[allDomains objectAtIndex: i] objectForKey: @"SOGoMailDomain"]])
-                break;
-            }
-
-          // We haven't found one
-          if (i == [allDomains count])
+          if (![[[SOGoSystemDefaults sharedSystemDefaults] domainIds] containsObject: *_domain])
             *_domain = nil;
         }
     }