amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-17 07:33:57 +00:00
Code Issues Projects Releases Wiki Activity

fix2

Browse Source
This commit is contained in:
Quentin Hivert
2025-07-21 15:42:57 +02:00
parent 8743ec7736
commit 4cf7d22ddf
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
SoObjects/SOGo/SOGoUser.m
View File

@@ -265,23 +265,32 @@ static const NSString *kEncryptedUserNamePrefix = @"uenc";
- (NSString *) loginInDomain
{
SOGoSystemDefaults *sd;
NSString *_domain, *realLoginInDOmain;
NSString *_domain, *realLoginInDomain;
NSRange r;
NSLog(@"loginInDomain start: %@", loginInDomain);
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainBasedUID] || [[sd loginDomains] count] > 0)
{
r = [loginInDomain rangeOfString: @"@" options: NSBackwardsSearch];
if (r.location == NSNotFound)
{
_domain = [self _fetchFieldForUser: @"c_domain"];
if (_domain != nil)
{
realLoginInDOmain = [NSString stringWithFormat: @"%@@%@", loginInDomain, _domain];
return realLoginInDOmain;
}
}
NSLog(@"loginInDomain enableDomainBasedUID: %@", self->login);
return self->login;
// r = [loginInDomain rangeOfString: @"@" options: NSBackwardsSearch];
// if (r.location == NSNotFound)
// {
// _domain = [self _fetchFieldForUser: @"c_domain"];
// if (_domain != nil)
// {
// realLoginInDomain = [NSString stringWithFormat: @"%@@%@", loginInDomain, _domain];
// NSLog(@"loginInDomain return: %@", realLoginInDomain):
// return realLoginInDomain;
// }
// else
// {
// NSLog(@"loginInDomain return: %@", [self _fetchFieldForUser: @"c_email"]):
// return [self _fetchFieldForUser: @"c_email"];
// }
// }
}
NSLog(@"loginInDomain return: %@", loginInDomain);
return loginInDomain;
}