amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-24 11:48:54 +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 authored and Francis Lachapelle committed 2014-11-11 22:32:45 -05:00
1 parent d46117f92d
commit ff5b25972f
7 files changed
+364 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/MainUI/SOGoUserHomePage.m
+7 -7
View File
@@ -383,7 +383,8 @@
NSString *uid;
NSDictionary *contact;
NSString *contactInfo, *login;
NSMutableArray *jsonResponse, *jsonLine;
NSMutableArray *jsonResponse;
NSMutableDictionary *jsonLine;
NSArray *allUsers;
int count, max;
BOOL activeUserIsInDomain;
@@ -405,16 +406,15 @@
// We do NOT return the current authenticated user
if (!activeUserIsInDomain || ![uid isEqualToString: login])
{
jsonLine = [NSMutableArray arrayWithCapacity: 4];
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];
}
}