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

SoObjects/SOGo/SOGoDefaults.plist

@@ -29,7 +29,7 @@
     SOGoWebAccessEnabled = YES;
     SOGoCalendarDAVAccessEnabled = YES;
     SOGoAddressBookDAVAccessEnabled = YES;
-    SOGoEnableDomainWithUID = NO;
+    SOGoEnableDomainBasedUID = NO;
 
     SOGoLoginModule = "Mail";
     SOGoLanguage = "English";

SoObjects/SOGo/SOGoSession.m

@@ -254,7 +254,7 @@
   *theDomain = nil;
   
   sd = [SOGoSystemDefaults sharedSystemDefaults];
-  if ([sd enableDomainWithUID])
+  if ([sd enableDomainBasedUID])
     {
       r = [*theLogin rangeOfString: @"@" options: NSBackwardsSearch];
       if (r.location != NSNotFound)

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -34,7 +34,7 @@
 + (SOGoSystemDefaults *) sharedSystemDefaults;
 
 - (NSArray *) domainIds;
-- (BOOL) enableDomainWithUID;
+- (BOOL) enableDomainBasedUID;
 - (NSArray *) loginDomains;
 - (NSArray *) visibleDomainsForDomain: (NSString *) domain;
 

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -193,9 +193,9 @@ BootstrapNSUserDefaults ()
   return [[self dictionaryForKey: @"domains"] allKeys];
 }
 
-- (BOOL) enableDomainWithUID
+- (BOOL) enableDomainBasedUID
 {
-  return ([[self domainIds] count] > 0 && [self boolForKey: @"SOGoEnableDomainWithUID"]);
+  return ([[self domainIds] count] > 0 && [self boolForKey: @"SOGoEnableDomainBasedUID"]);
 }
 
 - (NSArray *) loginDomains

SoObjects/SOGo/SOGoUser.m

@@ -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"];
 	}
 

SoObjects/SOGo/SOGoUserFolder.m

@@ -397,7 +397,7 @@
   NSString *field, *login, *domain;
   NSArray *users;
   int i;
-  BOOL enableDomainWithUID;
+  BOOL enableDomainBasedUID;
 
 #warning the attributes returned here should match the one requested in the query
   fetch = [NSMutableString string];
@@ -405,7 +405,7 @@
   login = [[context activeUser] login];
   um = [SOGoUserManager sharedUserManager];
   sd = [SOGoSystemDefaults sharedSystemDefaults];
-  enableDomainWithUID = [sd enableDomainWithUID];
+  enableDomainBasedUID = [sd enableDomainBasedUID];
   domain = [[context activeUser] domain];
   domains = [[sd visibleDomainsForDomain: domain] objectEnumerator];
   while (domain)
@@ -418,7 +418,7 @@
         {
           currentUser = [users objectAtIndex: i];
           field = [currentUser objectForKey: @"c_uid"];
-          if (enableDomainWithUID)
+          if (enableDomainBasedUID)
             field = [NSString stringWithFormat: @"%@@%@", field, domain];
           if (![field isEqualToString: login])
             {

SoObjects/SOGo/SOGoUserManager.m

@@ -716,7 +716,7 @@
   infos = nil;
 
   sd = [SOGoSystemDefaults sharedSystemDefaults];
-  if ([sd enableDomainWithUID])
+  if ([sd enableDomainBasedUID])
     {
       r = [uid rangeOfString: @"@" options: NSBackwardsSearch];
       if (r.location != NSNotFound)