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

merge of '829ccf73000a2d91a5daf67741479e395011b6a8'

Browse Source 
and 'ed98effe549d74bf8029681e84b1654da70530c3'

Monotone-Parent: 829ccf73000a2d91a5daf67741479e395011b6a8
Monotone-Parent: ed98effe549d74bf8029681e84b1654da70530c3
Monotone-Revision: e907e470c7aa26b32fa9c7a7ebd2b18a41a700a8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-27T15:23:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-07-27 15:23:23 +00:00
parent aad817d5ca 44c36621a8
commit c0f6644589
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10
View File
@@ -1,3 +1,13 @@
2011-07-27 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m (-ownerInContext:): in case the
user domain is specified in the URL but not in the user login
name, we remove it (user@domain => user).
* SoObjects/SOGo/SOGoUser.m (-initWithLogin:roles:trust:): drop
the domain from the login name when loginDomains are enabled but
domain-based UID is disabled.
2011-07-26 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailFolderTable.[hm]: removed useless class.
SoObjects/SOGo/SOGoUser.m
+7 -1
View File
@@ -156,7 +156,7 @@
else
{
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainBasedUID])
if ([sd enableDomainBasedUID] || [[sd loginDomains] count] > 0)
{
r = [newLogin rangeOfString: @"@" options: NSBackwardsSearch];
if (r.location != NSNotFound)
@@ -168,6 +168,12 @@
newLogin = [newLogin substringToIndex: r.location];
else
domain = nil;
if (domain != nil && ![sd enableDomainBasedUID])
// Login domains are enabled (SOGoLoginDomains) but not
// domain-based UID (SOGoEnableDomainBasedUID).
// Drop the domain from the login name.
domain = nil;
}
}
SoObjects/SOGo/SOGoUserFolder.m
+9 -1
View File
@@ -103,12 +103,20 @@
- (NSString *) ownerInContext: (WOContext *) _ctx
{
NSString *login;
SOGoUser *ownerUser;
if (!owner)
{
ownerUser = [SOGoUser userWithLogin: nameInContainer roles: nil];
[self setOwner: [ownerUser login]];
login = [ownerUser login];
[self setOwner: login];
if (![nameInContainer isEqualToString: login])
// In case the user domain is specified in the URL but not in the user
// login name, we remove it (user@domain => user).
// This happens when SOGoLoginDomains is defined but
// SOGoEnableDomainBasedUID is disabled.
ASSIGN(nameInContainer, login);
}
return owner;