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

Created user-modal.js, code refactoring

Browse Source 
Conflicts:

	UI/Common/UIxAclEditor.m
	UI/Common/UIxUserRightsEditor.m
	UI/Common/product.plist
	UI/Contacts/UIxContactsUserRightsEditor.m
	UI/Templates/ContactsUI/UIxContactFoldersView.wox
	UI/WebServerResources/js/Common/resource.js
	UI/WebServerResources/js/ContactsUI.js
This commit is contained in:
Alexandre Cloutier
2014-11-11 22:32:45 -05:00
committed by Francis Lachapelle
parent ff5b25972f
commit 3f27e9bb57
11 changed files with 338 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Common/UIxUserRightsEditor.m
+71 -39
View File
@@ -119,29 +119,62 @@
if ([newUID length] > 0)
{
if (!defaultUserID)
ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
um = [SOGoUserManager sharedUserManager];
if ([newUID isEqualToString: defaultUserID]
|| [newUID isEqualToString: @"anonymous"]
|| [[um getEmailForUID: newUID] length] > 0)
{
if (![newUID hasPrefix: @"@"])
{
if ([newUID isEqualToString: defaultUserID]
|| [newUID isEqualToString: @"anonymous"]
|| [[um getEmailForUID: newUID] length] > 0)
{
if (![newUID hasPrefix: @"@"])
{
domain = [[context activeUser] domain];
group = [SOGoGroup groupWithIdentifier: newUID inDomain: domain];
if (group)
newUID = [NSString stringWithFormat: @"@%@", newUID];
}
group = [SOGoGroup groupWithIdentifier: newUID inDomain: domain];
if (group)
newUID = [NSString stringWithFormat: @"@%@", newUID];
}
ASSIGN (uid, newUID);
clientObject = [self clientObject];
[userRights addObjectsFromArray: [clientObject aclsForUser: uid]];
ASSIGN (uid, newUID);
clientObject = [self clientObject];
[userRights addObjectsFromArray: [clientObject aclsForUser: uid]];
response = YES;
}
response = YES;
}
}
return response;
}
- (BOOL) _initRightsForUserID:(NSString *) newUID
{
BOOL response;
NSString *domain;
SOGoUserManager *um;
SOGoObject *clientObject;
SOGoGroup *group;
response = NO;
if ([newUID length] > 0)
{
if (!defaultUserID)
ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
um = [SOGoUserManager sharedUserManager];
if ([newUID isEqualToString: defaultUserID] || [newUID isEqualToString: @"anonymous"]
|| [[um getEmailForUID: newUID] length] > 0)
{
if (![newUID hasPrefix: @"@"])
{
domain = [[context activeUser] domain];
group = [SOGoGroup groupWithIdentifier: newUID inDomain: domain];
if (group)
newUID = [NSString stringWithFormat: @"@%@", newUID];
}
ASSIGN (uid, newUID);
clientObject = [self clientObject];
[userRights addObjectsFromArray: [clientObject aclsForUser: uid]];
response = YES;
}
}
return response;
}
@@ -150,14 +183,13 @@
id <WOActionResults> response;
if (![self _initRights])
response = [NSException exceptionWithHTTPStatus: 403
reason: @"No such user."];
else
{
[self prepareRightsForm];
response = self;
}
response = [self responseWithStatus: 403
andString: @"No such user."];
else {
//[self prepareRightsForm];
response = [self responseWithStatus: 200
andString:[[self userRightsForObject] jsonRepresentation]];
}
return response;
}
@@ -186,32 +218,31 @@
- (id <WOActionResults>) saveUserRightsAction
{
id <WOActionResults> response;
WORequest *request;
SOGoDomainDefaults *dd;
NSDictionary *jsonObject, *currentObject;
NSDictionary *dirtyUsers, *currentUser, *jsonResponse;;
NSEnumerator *enumerator;
NSString *uid;
NSArray *o;
id key;
value = [[self context] request];
jsonObject = [[value contentAsString] objectFromJSONString];
enumerator = [jsonObject keyEnumerator];
request = [[self context] request];
dirtyUsers = [[request contentAsString] objectFromJSONString];
enumerator = [dirtyUsers keyEnumerator];
while((key = [enumerator nextObject]))
while((uid = [enumerator nextObject]))
{
currentObject = [jsonObject objectForKey: key];
if(![self _initRightsWithParameter: [currentObject objectForKey: @"uid"]])
currentUser = [dirtyUsers objectForKey: uid];
if(!([self _initRightsForUserID: [currentUser objectForKey: @"uid"]]))
{
jsonResponse = [NSDictionary dictionaryWithObject: @"No such user." forKey: @"error"];
response = [self responseWithStatus: 403
andString: @"No such user."];
andString: [jsonResponse jsonRepresentation]];
return response;
}
else
{
NSArray *o;
o = [NSArray arrayWithArray: userRights];
[self updateRights];
[self updateRights:[currentUser objectForKey: @"aclOptions"]];
[[self clientObject] setRoles: userRights forUser: uid];
dd = [[context activeUser] domainDefaults];
@@ -220,7 +251,8 @@
response = [self jsCloseWithRefreshMethod: nil];
}
}
response = [self responseWithStatus: 200];
return response;
}