Renamed SOGoEnableDomainWithUID to SOGoEnableDomainBasedUID.

Monotone-Parent: 297140f163083c23ae6ed58e7f2fe17a62277d31
Monotone-Revision: 6d9f4a1dbd4808e626cd25041219c5bb22a5626f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-19T16:25:11
Monotone-Branch: ca.inverse.sogo
Monotone-Tag: SOGo_v1.3.8a
Monotone-Tag: v1.3.8a
This commit is contained in:
Francis Lachapelle
2011-07-19 16:25:11 +00:00
parent 4eacacc8c8
commit 20e43626b5
11 changed files with 22 additions and 22 deletions
+3 -3
View File
@@ -125,7 +125,7 @@
/**
* Return a new instance for the login name, which can be appended by a
* domain name. The domain is extracted only if the system defaults
* SOGoEnableDomainWithUID is enabled.
* SOGoEnableDomainBasedUID is enabled.
*
* @param newLogin a login name optionally follow by @domain
* @param newRoles
@@ -155,7 +155,7 @@
else
{
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainWithUID])
if ([sd enableDomainBasedUID])
{
r = [newLogin rangeOfString: @"@" options: NSBackwardsSearch];
if (r.location != NSNotFound)
@@ -180,7 +180,7 @@
contactInfos = [um contactInfosForUserWithUIDorEmail: newLogin
inDomain: domain];
realUID = [contactInfos objectForKey: @"c_uid"];
if (domain == nil && [sd enableDomainWithUID])
if (domain == nil && [sd enableDomainBasedUID])
domain = [contactInfos objectForKey: @"c_domain"];
}