git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1068 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / SoObjects / SOGo / SOGoObject.m

diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 57b13cd78a0858d6b4a53609943ed59400b84fe9..5ca5809f75ea623ce7b2789bb784495f79c1db20 100644 (file)
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -47,8 +47,6 @@
 
 #import "SOGoObject.h"
 
-NSString *SOGoDefaultUserID = @"<default>";
-
 @interface SOGoObject(Content)
 - (NSString *)contentAsString;
 @end
@@ -354,23 +352,23 @@ static BOOL kontactGroupDAV = YES;
 
 - (SOGoDAVSet *) davAcl
 {
-  NSArray *role;
-  NSEnumerator *acls;
+  NSArray *roles;
+  NSEnumerator *uids;
   NSMutableDictionary *aclsDictionary;
-  NSDictionary *currentAcl;
+  NSString *currentUID;
   SoClassSecurityInfo *sInfo;
 
-  acls = [[self acls] objectEnumerator];
   aclsDictionary = [NSMutableDictionary dictionary];
+  uids = [[self aclUsers] objectEnumerator];
   sInfo = [[self class] soClassSecurityInfo];
 
-  currentAcl = [acls nextObject];
-  while (currentAcl)
+  currentUID = [uids nextObject];
+  while (currentUID)
     {
-      role = [NSArray arrayWithObject: [currentAcl objectForKey: @"role"]];
-      [aclsDictionary setObject: [sInfo DAVPermissionsForRoles: role]
-                      forKey: [currentAcl objectForKey: @"uid"]];
-      currentAcl = [acls nextObject];
+      roles = [self aclsForUser: currentUID];
+      [aclsDictionary setObject: [sInfo DAVPermissionsForRoles: roles]
+                      forKey: currentUID];
+      currentUID = [uids nextObject];
     }
   [self _appendRolesForPseudoPrincipals: aclsDictionary
         withClassSecurityInfo: sInfo];
@@ -707,7 +705,7 @@ static BOOL kontactGroupDAV = YES;
 
 /* acls */
 
-- (NSArray *) acls
+- (NSArray *) aclUsers
 {
   [self subclassResponsibility: _cmd];
 
@@ -721,22 +719,27 @@ static BOOL kontactGroupDAV = YES;
   return nil;
 }
 
-- (NSArray *) defaultAclRoles
+- (void) setRoles: (NSArray *) roles
+          forUser: (NSString *) uid
 {
   [self subclassResponsibility: _cmd];
-
-  return nil;
 }
 
-- (void) setRoles: (NSArray *) roles
-          forUser: (NSString *) uid
+- (void) removeAclsForUsers: (NSArray *) users
 {
   [self subclassResponsibility: _cmd];
 }
 
-- (void) removeAclsForUsers: (NSArray *) users
+- (NSString *) defaultUserID
 {
   [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
+- (BOOL) hasSupportForDefaultRoles
+{
+  return NO;
 }
 
 /* description */