diff --git a/ChangeLog b/ChangeLog index 7457383f6..4abe546ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2011-07-19 Francis Lachapelle * SoObjects/SOGo/SOGoUserFolder.m (-_davFetchUsersMatching:): - append the domain to the username when SOGoEnableDomainWithUID is + append the domain to the username when SOGoEnableDomainBasedUID is set to YES. When using domains, fetch matching users from visible domains. @@ -13,20 +13,20 @@ 2011-07-18 Francis Lachapelle - * SoObjects/SOGo/SOGoSystemDefaults.m (-enableDomainWithUID): new + * SoObjects/SOGo/SOGoSystemDefaults.m (-enableDomainBasedUID): new method that returns the boolean value of the new system defaults - SOGoEnableDomainWithUID if at least one domain is defined. + SOGoEnableDomainBasedUID if at least one domain is defined. * SoObjects/SOGo/SOGoUser.m (-initWithLogin:roles:trust:): try to extract the domain part of the login name only if the new system - defaults SOGoEnableDomainWithUID is set to YES. If the domain is not - specified but SOGoEnableDomainWithUID is enabled, add the domain to the + defaults SOGoEnableDomainBasedUID is set to YES. If the domain is not + specified but SOGoEnableDomainBasedUID is enabled, add the domain to the login name. * SoObjects/SOGo/SOGoUserManager.m (-contactInfosForUserWithUIDorEmail): try to extract the domain part of the login name only if the new system defaults - SOGoEnableDomainWithUID is set to YES.. + SOGoEnableDomainBasedUID is set to YES.. * SoObjects/SOGo/SOGoSession.m (+decodeValue:usingKey:login:domain:password:): idem. @@ -38,7 +38,7 @@ * UI/MainUI/SOGoUserHomePage.m (-usersSearchAction): only append the domain to the user's login if the new system defaults - SOGoEnableDomainWithUID is set to YES. + SOGoEnableDomainBasedUID is set to YES. 2011-07-15 Wolfgang Sourdeau diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt index e7d97b6bf..e1ee8e7f0 100644 Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ diff --git a/NEWS b/NEWS index 5d103dac0..838fb1016 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,8 @@ 1.3-20110719 (1.3.8a) --------------------- New Features - - new system setting SOGoEnableDomainWithUID to enable user identification - by domain + - new system setting SOGoEnableDomainBasedUID to enable user identification + by domain Bug Fixes - fixed a buffer overflow in SOPE (mainly affecting OpenBSD) diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist index 03349808e..8e38930fb 100644 --- a/SoObjects/SOGo/SOGoDefaults.plist +++ b/SoObjects/SOGo/SOGoDefaults.plist @@ -29,7 +29,7 @@ SOGoWebAccessEnabled = YES; SOGoCalendarDAVAccessEnabled = YES; SOGoAddressBookDAVAccessEnabled = YES; - SOGoEnableDomainWithUID = NO; + SOGoEnableDomainBasedUID = NO; SOGoLoginModule = "Mail"; SOGoLanguage = "English"; diff --git a/SoObjects/SOGo/SOGoSession.m b/SoObjects/SOGo/SOGoSession.m index aa90da221..fce46aa5c 100644 --- a/SoObjects/SOGo/SOGoSession.m +++ b/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) diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h index af959bbed..8f17eb39c 100644 --- a/SoObjects/SOGo/SOGoSystemDefaults.h +++ b/SoObjects/SOGo/SOGoSystemDefaults.h @@ -34,7 +34,7 @@ + (SOGoSystemDefaults *) sharedSystemDefaults; - (NSArray *) domainIds; -- (BOOL) enableDomainWithUID; +- (BOOL) enableDomainBasedUID; - (NSArray *) loginDomains; - (NSArray *) visibleDomainsForDomain: (NSString *) domain; diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m index 44112bf7c..f617d6d6e 100644 --- a/SoObjects/SOGo/SOGoSystemDefaults.m +++ b/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 diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index dd0358cab..4e5fe936a 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/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"]; } diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index 5241b30bc..4e10614a1 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/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]) { diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m index 7ae65a416..9fa124793 100644 --- a/SoObjects/SOGo/SOGoUserManager.m +++ b/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) diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index 513792ec0..2d79eef0a 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -378,7 +378,7 @@ um = [SOGoUserManager sharedUserManager]; sd = [SOGoSystemDefaults sharedSystemDefaults]; domain = [[context activeUser] domain]; - uidDomain = [sd enableDomainWithUID]? domain : nil; + uidDomain = [sd enableDomainBasedUID]? domain : nil; users = [self _usersForResults: [um fetchUsersMatching: contact inDomain: domain] inDomain: uidDomain];