Monotone-Parent: ffee2e191d0b888d3bfb2c7d6d16836788f668d0

Monotone-Revision: 575cf41d358a8719c8b0d9a19301b8c29bbb1c30

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-29T16:14:11
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoFolder.m

@@ -30,6 +30,7 @@
 
 #import "NSString+Utilities.h"
 
+#import "SOGoPermissions.h"
 #import "SOGoFolder.h"
 
 @implementation SOGoFolder
@@ -241,6 +242,13 @@
 
 /* acls */
 
+- (NSArray *) subscriptionRoles
+{
+  return [NSArray arrayWithObjects: SoRole_Owner, SOGoRole_ObjectViewer,
+		  SOGoRole_ObjectEditor, SOGoRole_ObjectCreator,
+ SOGoRole_ObjectEraser, nil];
+}
+
 - (NSArray *) aclsForUser: (NSString *) uid
 {
   return nil;

SoObjects/SOGo/SOGoGCSFolder.m

@@ -452,10 +452,7 @@ static NSString *defaultUserID = @"<default>";
 
   acls = [NSMutableArray array];
   if ([records count] > 0)
-    {
-      [acls addObject: SOGoRole_AuthorizedSubscriber];
-      [acls addObjectsFromArray: [records valueForKey: @"c_role"]];
-    }
+    [acls addObjectsFromArray: [records valueForKey: @"c_role"]];
 
   return acls;
 }

SoObjects/SOGo/SOGoObject.h

@@ -111,6 +111,8 @@
 
 /* acls */
 
+- (NSArray *) subscriptionRoles;
+
 - (NSArray *) aclUsers;
 - (NSArray *) aclsForUser: (NSString *) uid;
 - (void) setRoles: (NSArray *) roles

SoObjects/SOGo/SOGoObject.m

@@ -830,6 +830,12 @@ static BOOL kontactGroupDAV = YES;
 
 /* acls */
 
+/* roles required to obtain the "authorized subscriber" role */
+- (NSArray *) subscriptionRoles
+{
+  return [container subscriptionRoles];
+}
+
 - (NSArray *) aclUsers
 {
   [self subclassResponsibility: _cmd];

SoObjects/SOGo/SOGoUser.m

@@ -604,8 +604,11 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
   if ([object isKindOfClass: [SOGoObject class]])
     {
       sogoRoles = [(SOGoObject *) object aclsForUser: login];
-      if (sogoRoles)
+      if ([sogoRoles count])
         [rolesForObject addObjectsFromArray: sogoRoles];
+      sogoRoles = [(SOGoObject *) object subscriptionRoles];
+      if ([sogoRoles firstObjectCommonWithArray: rolesForObject])
+	[rolesForObject addObject: SOGoRole_AuthorizedSubscriber];
     }
 
   return rolesForObject;