amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-13 07:47:12 +00:00
Code Issues Projects Releases Wiki Activity

Add domain to lookupContactEntry

Browse Source
This commit is contained in:
Jesús García Sáez authored and Carlos Pérez-Aradros Herce committed 2015-11-05 19:11:19 +01:00
1 parent 48832a4878
commit 7d49674d9d
6 files changed
+27 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/SOGo/LDAPSource.m
+1
View File
@@ -1242,6 +1242,7 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
}
- (NSDictionary *) lookupContactEntry: (NSString *) theID
inDomain: (NSString *) domain
{
NGLdapEntry *ldapEntry;
EOQualifier *qualifier;
SoObjects/SOGo/SOGoSource.h
+2 -1
View File
@@ -56,7 +56,8 @@
newPassword: (NSString *) newPassword
perr: (SOGoPasswordPolicyError *) perr;
- (NSDictionary *) lookupContactEntry: (NSString *) theID;
- (NSDictionary *) lookupContactEntry: (NSString *) theID
inDomain: (NSString *) domain;
- (NSDictionary *) lookupContactEntryWithUIDorEmail: (NSString *) entryID
inDomain: (NSString *) domain;
SoObjects/SOGo/SOGoUserManager.m
+1 -1
View File
@@ -1047,7 +1047,7 @@ static Class NSNullK;
while ((sourceID = [sources nextObject]))
{
currentSource = [_sources objectForKey: sourceID];
contact = [currentSource lookupContactEntry: uid];
contact = [currentSource lookupContactEntry: uid inDomain: domain];
if (contact)
[contacts addObject: contact];
}
SoObjects/SOGo/SQLSource.m
+2 -1
View File
@@ -618,8 +618,9 @@
- (NSDictionary *) lookupContactEntry: (NSString *) theID
inDomain: (NSString *) domain
{
return [self _lookupContactEntry: theID considerEmail: NO inDomain: nil];
return [self _lookupContactEntry: theID considerEmail: NO inDomain: domain];
}
- (NSDictionary *) lookupContactEntryWithUIDorEmail: (NSString *) entryID