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

See ChangeLog.

Browse Source 
Monotone-Parent: 42fa26da9b1def06a194726cab4199338a4bdf4c
Monotone-Revision: 88b07aa8edf775fa02705a9c03a0f8f14f905db3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-15T22:22:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-07-15 22:22:11 +00:00
parent 8aae19aeb8
commit 620872202d
14 changed files with 111 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MainUI/SOGoRootPage.m
+1 -1
View File
@@ -167,7 +167,7 @@
language = [request formValueForKey: @"language"];
domain = [request formValueForKey: @"domain"];
if ((b = [auth checkLogin: username password: password domain: domain
if ((b = [auth checkLogin: username password: password domain: &domain
perr: &err expire: &expire grace: &grace])
&& (err == PolicyNoError)
// no password policy
UI/MainUI/SOGoUserHomePage.m
+6 -5
View File
@@ -366,30 +366,31 @@
{
NSMutableArray *users;
NSArray *currentUsers;
NSString *contact, *domain;
NSString *contact, *domain, *uidDomain;
NSEnumerator *visibleDomains;
id <WOActionResults> result;
SOGoUserManager *um;
SOGoSystemDefaults *sd;
um = [SOGoUserManager sharedUserManager];
contact = [self queryParameterForKey: @"search"];
if ([contact length])
{
um = [SOGoUserManager sharedUserManager];
sd = [SOGoSystemDefaults sharedSystemDefaults];
domain = [[context activeUser] domain];
uidDomain = [sd addDomainToUID]? domain : nil;
users = [self _usersForResults: [um fetchUsersMatching: contact
inDomain: domain]
inDomain: domain];
inDomain: uidDomain];
if ([domain length])
{
// Add results from visible domains
sd = [SOGoSystemDefaults sharedSystemDefaults];
visibleDomains = [[sd visibleDomainsForDomain: domain] objectEnumerator];
while ((domain = [visibleDomains nextObject]))
{
currentUsers = [self _usersForResults: [um fetchUsersMatching: contact
inDomain: domain]
inDomain: domain];
inDomain: uidDomain];
[users addObjectsFromArray: currentUsers];
}
}