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

Renamed SOGoEnableDomainWithUID to SOGoEnableDomainBasedUID.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+7 -7
View File
@@ -1,7 +1,7 @@
2011-07-19 Francis Lachapelle <flachapelle@inverse.ca>
* 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 <flachapelle@inverse.ca>
* 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 <wsourdeau@inverse.ca>
Documentation/SOGo Installation Guide.odt
BIN
View File
Binary file not shown.
NEWS
+2 -2
View File
@@ -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)
SoObjects/SOGo/SOGoDefaults.plist
+1 -1
View File
@@ -29,7 +29,7 @@
SOGoWebAccessEnabled = YES;
SOGoCalendarDAVAccessEnabled = YES;
SOGoAddressBookDAVAccessEnabled = YES;
SOGoEnableDomainWithUID = NO;
SOGoEnableDomainBasedUID = NO;
SOGoLoginModule = "Mail";
SOGoLanguage = "English";
SoObjects/SOGo/SOGoSession.m
+1 -1
View File
@@ -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
+1 -1
View File
@@ -34,7 +34,7 @@
+ (SOGoSystemDefaults *) sharedSystemDefaults;
- (NSArray *) domainIds;
- (BOOL) enableDomainWithUID;
- (BOOL) enableDomainBasedUID;
- (NSArray *) loginDomains;
- (NSArray *) visibleDomainsForDomain: (NSString *) domain;
SoObjects/SOGo/SOGoSystemDefaults.m
+2 -2
View File
@@ -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
+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"];
}
SoObjects/SOGo/SOGoUserFolder.m
+3 -3
View File
@@ -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
+1 -1
View File
@@ -716,7 +716,7 @@
infos = nil;
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainWithUID])
if ([sd enableDomainBasedUID])
{
r = [uid rangeOfString: @"@" options: NSBackwardsSearch];
if (r.location != NSNotFound)
UI/MainUI/SOGoUserHomePage.m
+1 -1
View File
@@ -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];