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

This reverts commit d07df554f3.

SoObjects/SOGo/SOGoUser.m

@@ -165,9 +165,8 @@
               // 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] &&
-                  ![sd enableDomainBasedUID])
-                newLogin = [newLogin substringToIndex: r.location];
+              if (![[sd domainIds] containsObject: domain])
+                domain = nil;
 
               if (domain != nil && ![sd enableDomainBasedUID])
                 // Login domains are enabled (SOGoLoginDomains) but not

SoObjects/SOGo/SOGoUserManager.m

@@ -514,9 +514,21 @@ static Class NSNullK;
 
       if (r.location != NSNotFound)
         {
+          NSArray *allDomains;
+          int i;
+
           *_domain = [username substringFromIndex: r.location+1];
 
-          if (![[[SOGoSystemDefaults sharedSystemDefaults] domainIds] containsObject: *_domain])
+          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])
             *_domain = nil;
         }
     }