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

See ChangeLog.

Browse Source 
Monotone-Parent: 42fa26da9b1def06a194726cab4199338a4bdf4c
Monotone-Revision: 88b07aa8edf775fa02705a9c03a0f8f14f905db3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-15T22:22:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-07-15 22:22:11 +00:00
parent 8aae19aeb8
commit 620872202d
14 changed files with 111 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUser.m
+15 -11
View File
@@ -124,7 +124,8 @@
/**
* Return a new instance for the login name, which can be appended by a
* domain name.
* domain name. The domain is extracted only if the system defaults
* SOGoAddDomainToUID is enabled.
*
* @param newLogin a login name optionally follow by @domain
* @param newRoles
@@ -152,17 +153,20 @@
realUID = newLogin;
else
{
r = [newLogin rangeOfString: @"@" options: NSBackwardsSearch];
if (r.location != NSNotFound)
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd addDomainToUID])
{
// The domain is probably appended to the username;
// make sure it is defined as a login domain in the configuration.
sd = [SOGoSystemDefaults sharedSystemDefaults];
domain = [newLogin substringFromIndex: (r.location + r.length)];
if ([[sd loginDomains] containsObject: domain])
newLogin = [newLogin substringToIndex: r.location];
else
domain = nil;
r = [newLogin rangeOfString: @"@" options: NSBackwardsSearch];
if (r.location != NSNotFound)
{
// 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])
newLogin = [newLogin substringToIndex: r.location];
else
domain = nil;
}
}
newLogin = [newLogin stringByReplacingString: @"%40"