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

Monotone-Parent: a969c621c7bdf36505c11f0aaf6e61680e8375f7

Browse Source 
Monotone-Revision: a0d688640ff502de6334d633e962b52008bb8ace

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-05T23:41:24
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-05-05 23:41:24 +00:00
parent e6e6542d95
commit 16f8510f24
2 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3
View File
@@ -1,5 +1,8 @@
2008-05-05 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m ([SOGoObject
-davAclQuery:queryContext]): parse the names only of element nodes.
* UI/Common/UIxFolderActions.m ([UIxFolderActions -activateFolderAction])
([UIxFolderActions -deactivateFolderAction]): reversed the logic
and remove or add the folder name from/into the 'InactiveFolders'
SoObjects/SOGo/SOGoObject.m
+49 -51
View File
@@ -786,7 +786,7 @@ static NSDictionary *reportMap = nil;
{
NSString *command;
command = [[document firstChild] nodeName];
command = [[document firstChild] localName];
return [NSString stringWithFormat: @"%@:", command];
}
@@ -1329,16 +1329,16 @@ static NSDictionary *reportMap = nil;
- (NSArray *) _davGetRolesFromRequest: (id <DOMNode>) node
{
NSMutableArray *roles;
id <DOMNodeList> childNodes;
NSArray *childNodes;
NSString *currentRole;
unsigned int count, max;
roles = [NSMutableArray array];
childNodes = [node childNodes];
max = [childNodes length];
childNodes = [self domNode: node getChildNodesByType: DOM_ELEMENT_NODE];
max = [childNodes count];
for (count = 0; count < max; count++)
{
currentRole = [[childNodes objectAtIndex: count] nodeName];
currentRole = [[childNodes objectAtIndex: count] localName];
[roles addObject: currentRole];
}
@@ -1350,57 +1350,55 @@ static NSDictionary *reportMap = nil;
id <DOMNode> node, userAttr;
id <DOMNamedNodeMap> attrs;
NSString *nodeName, *result, *response, *user;
NSArray *childNodes;
node = [[document documentElement] firstChild];
nodeName = [node nodeName];
if ([nodeName isEqualToString: @"user-list"])
result = [self _davAclUserListQuery];
else if ([nodeName isEqualToString: @"roles"])
result = nil;
childNodes = [self domNode: [document documentElement]
getChildNodesByType: DOM_ELEMENT_NODE];
if ([childNodes count])
{
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([user length])
result = [self _davAclUserRoles: user];
else
result = nil;
}
else if ([nodeName isEqualToString: @"set-roles"])
{
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([user length])
node = [childNodes objectAtIndex: 0];
nodeName = [node localName];
if ([nodeName isEqualToString: @"user-list"])
result = [self _davAclUserListQuery];
else if ([nodeName isEqualToString: @"roles"])
{
[self setRoles: [self _davGetRolesFromRequest: node]
forUser: user];
result = @"";
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([user length])
result = [self _davAclUserRoles: user];
}
else if ([nodeName isEqualToString: @"set-roles"])
{
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([user length])
{
[self setRoles: [self _davGetRolesFromRequest: node]
forUser: user];
result = @"";
}
}
else if ([nodeName isEqualToString: @"add-user"])
{
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([self addUserInAcls: user])
result = @"";
}
else if ([nodeName isEqualToString: @"remove-user"])
{
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([self removeUserFromAcls: user])
result = @"";
}
else
result = nil;
}
else if ([nodeName isEqualToString: @"add-user"])
{
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([self addUserInAcls: user])
result = @"";
else
result = nil;
}
else if ([nodeName isEqualToString: @"remove-user"])
{
attrs = [node attributes];
userAttr = [attrs namedItem: @"user"];
user = [userAttr nodeValue];
if ([self removeUserFromAcls: user])
result = @"";
else
result = nil;
}
else
result = nil;
if (result)
{