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

GUI for mobile version of AclUsers

Browse Source 
Conflicts:

	UI/Common/UIxAclEditor.m
	UI/Common/UIxUserRightsEditor.m
	UI/WebServerResources/js/Common/acl-model.js
This commit is contained in:
Alexandre Cloutier
2015-06-11 15:38:09 -04:00
committed by Francis Lachapelle
parent e4b1c0d5b9
commit f3c26671af
7 changed files with 365 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MainUI/SOGoUserHomePage.m
+8 -8
View File
@@ -440,7 +440,8 @@
NSString *uid;
NSDictionary *contact;
NSString *contactInfo, *login;
NSMutableArray *jsonResponse, *jsonLine;
NSMutableArray *jsonResponse;
NSMutableDictionary *jsonLine;
NSArray *allUsers;
int count, max;
BOOL activeUserIsInDomain;
@@ -462,16 +463,15 @@
// We do NOT return the current authenticated user
if (!activeUserIsInDomain || ![uid isEqualToString: login])
{
jsonLine = [NSMutableArray arrayWithCapacity: 4];
if ([domain length] && [uid rangeOfString: @"@"].location == NSNotFound)
jsonLine = [NSMutableDictionary dictionary];
if ([domain length])
uid = [NSString stringWithFormat: @"%@@%@", uid, domain];
[jsonLine addObject: uid];
[jsonLine addObject: [contact objectForKey: @"cn"]];
[jsonLine addObject: [contact objectForKey: @"c_email"]];
[jsonLine addObject: [NSNumber numberWithBool: [[contact objectForKey: @"isGroup"] boolValue]]];
[jsonLine setObject: uid forKey: @"uid"];
[jsonLine setObject: [NSString stringWithFormat:@"%@ <%@>",[contact objectForKey: @"cn"], [contact objectForKey: @"c_email"]] forKey: @"displayName"];
[jsonLine setObject: [NSNumber numberWithBool: [[contact objectForKey: @"isGroup"] boolValue]] forKey: @"isGroup"];
contactInfo = [contact objectForKey: @"c_info"];
if (contactInfo)
[jsonLine addObject: contactInfo];
[jsonLine setObject: contactInfo forKey: @"c_info"];
[jsonResponse addObject: jsonLine];
}
}