amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-19 13:43:22 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_12' (head c241a8e1e716fa0db3e4f4e370c051096cc2c3e2)

Browse Source 
to branch 'ca.inverse.sogo' (head d807738c8f35c5080fb2e1684404fb8d992c8032)

Monotone-Parent: c241a8e1e716fa0db3e4f4e370c051096cc2c3e2
Monotone-Parent: d807738c8f35c5080fb2e1684404fb8d992c8032
Monotone-Revision: 62ee066ad239ea56d6f2dc0b73f12d399813d68c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T21:01:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-01-12 21:01:06 +00:00
parent 84909dd628 56ad0c3289
commit b26858fdc2
74 changed files with 3452 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUserManager.m
+4 -2
View File
@@ -586,7 +586,7 @@
NSMutableArray *emails;
NSDictionary *userEntry;
NSEnumerator *sogoSources;
NSObject <SOGoDNSource> *currentSource;
NSObject <SOGoSource> *currentSource;
NSString *sourceID, *cn, *c_domain, *c_uid, *c_imaphostname, *c_imaplogin;
NSArray *c_emails;
BOOL access;
@@ -605,12 +605,14 @@
sogoSources = [[self authenticationSourceIDsInDomain: domain]
objectEnumerator];
while ((sourceID = [sogoSources nextObject]))
userEntry = nil;
while (!userEntry && (sourceID = [sogoSources nextObject]))
{
currentSource = [_sources objectForKey: sourceID];
userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid];
if (userEntry)
{
[currentUser setObject: sourceID forKey: @"SOGoSource"];
if (!cn)
cn = [userEntry objectForKey: @"c_cn"];
if (!c_uid)