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

This commit is contained in:
Ludovic Marcotte
2015-05-25 13:00:08 -04:00
parent 772c3b3115
commit d07df554f3
3 changed files with 12 additions and 19 deletions
+1 -13
View File
@@ -514,21 +514,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;
}
}