Monotone-Parent: 950ea2f4a5916f47123e12564b35c975f97e4c78

Monotone-Revision: a4f965425609368d1347526114e039b4c8f07962

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-20T23:09:35
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,20 @@
 2010-01-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentInboxFolder.m
+	(-davCalendarFreeBusySet): only advertise the collections owner by
+	the inbox's owner.
+	(-davScheduleDefaultCalendarURL): new caldav accessor.
+
+	* SoObjects/Appointments/SOGoAppointmentFolders.m
+	(-toManyRelationShipKeys): unconditionnally display the inbox
+	collection.
+	(-lookupName:inContext:acquire:): accepts "inbox" even when the
+	active user is not the owner.
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(-davResourceType): unconditionnally advertise "personal" as
+	schedule-outbox.
+
 	* UI/WebServerResources/scriptaculous.js: modified to use
 	ResourcesURL as base loading URL.
 

SOPE/sope-patchset-r1664.diff

@@ -6613,15 +6613,16 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
 ===================================================================
 --- sope-appserver/NGObjWeb/DAVPropMap.plist	(revision 1664)
 +++ sope-appserver/NGObjWeb/DAVPropMap.plist	(working copy)
-@@ -157,6 +157,7 @@
+@@ -157,6 +157,8 @@
    "{urn:ietf:params:xml:ns:caldav}supported-calendar-data" =
       davSupportedCalendarDataTypes;
    "{urn:ietf:params:xml:ns:caldav}calendar-description" = davDescription;
 +  "{urn:ietf:params:xml:ns:caldav}calendar-timezone" = davCalendarTimeZone;
++  "{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL" = davScheduleDefaultCalendarURL;
  
    /* CardDAV */
    "{urn:ietf:params:xml:ns:carddav}addressbook-home-set" = davAddressbookHomeSet;
-@@ -168,6 +169,8 @@
+@@ -168,6 +170,8 @@
    "{http://calendarserver.org/ns/}dropbox-home-URL" = davDropboxHomeURL;
    "{http://calendarserver.org/ns/}notifications-URL" = davNotificationsURL;
    "{http://calendarserver.org/ns/}getctag" = davCollectionTag;
@@ -7338,6 +7339,15 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
  	    hasConnectionHeader = YES;
  	}
  	
+@@ -789,7 +798,7 @@
+ 	NSLog(@"  END:   %@", fieldName);
+ #endif
+       }
+-      
++
+ #if HEAVY_DEBUG
+       NSLog(@"  HEADER:\n%@", header);
+       NSLog(@"  OUT: %@", out);
 Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
 ===================================================================
 --- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m	(revision 1664)

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -2308,7 +2308,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 {
   NSMutableArray *colType;
   NSArray *gdRT, *gdVEventCol, *gdVTodoCol;
-  NSString *login;
   WORequest *request;
 
   colType = [NSMutableArray arrayWithCapacity: 10];
@@ -2329,16 +2328,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
                  XMLNS_GROUPDAV, nil];
       [colType addObject: gdVTodoCol];
       if ([nameInContainer isEqualToString: @"personal"])
-        {
+        [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox",
-          login = [[context activeUser] login];
+                                     XMLNS_CALDAV, nil]];
-          if ([login isEqualToString: [self ownerInContext: self]])
-            {
-              // [colType addObject: [NSArray arrayWithObjects: @"schedule-inbox",
-              //   XMLNS_CALDAV, nil]];
-              [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox",
-                XMLNS_CALDAV, nil]];
-            }
-        }
     }
 
   return colType;

SoObjects/Appointments/SOGoAppointmentFolders.m

@@ -88,9 +88,9 @@
       currentUser = [context activeUser];
       login = [currentUser login];
       keys = [NSMutableArray array];
+      [keys addObject: @"inbox"];
       if ([owner isEqualToString: login])
         {
-          [keys addObject: @"inbox"];
           sortedSubFolders = [[self subFolders] objectEnumerator];
           while ((currentFolder = [sortedSubFolders nextObject]))
             {
@@ -120,17 +120,10 @@
           acquire: (BOOL) acquire
 {
   id obj;
-  NSString *login;
 
   if ([name isEqualToString: @"inbox"])
-    {
+    obj = [SOGoAppointmentInboxFolder objectWithName: name
-      login = [[context activeUser] login];
+                                         inContainer: self];
-      if ([owner isEqualToString: login])
-        obj = [SOGoAppointmentInboxFolder objectWithName: name
-                                             inContainer: self];
-      else
-        obj = nil;
-    }
   else
     obj = [super lookupName: name inContext: lookupContext acquire: NO];
 

SoObjects/Appointments/SOGoAppointmentInboxFolder.m

@@ -27,6 +27,7 @@
 #import <NGObjWeb/WOContext+SoObjects.h>
 
 #import <SOGo/NSObject+DAV.h>
+#import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoWebDAVValue.h>
 
@@ -43,17 +44,9 @@
 
 - (NSArray *) davResourceType
 {
-  NSMutableArray *colType;
+  return [NSArray arrayWithObjects: @"collection",
-  NSString *login;
+                  [NSArray arrayWithObjects: @"schedule-inbox", XMLNS_CALDAV, nil],
-
+                  nil];
-  colType = [NSMutableArray arrayWithCapacity: 10];
-  [colType addObject: @"collection"];
-  login = [[context activeUser] login];
-  if ([login isEqualToString: [self ownerInContext: self]])
-    [colType addObject: [NSArray arrayWithObjects: @"schedule-inbox",
-                                 XMLNS_CALDAV, nil]];
-
-  return colType;
 }
 
 - (SOGoWebDAVValue *) davCalendarFreeBusySet
@@ -66,9 +59,10 @@
   response = [NSMutableArray array];
   subFolders = [[container subFolders] objectEnumerator];
   while ((currentFolder = [subFolders nextObject]))
-    [response
+    if ([owner isEqualToString: [currentFolder ownerInContext: context]])
-      addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
+      [response
-					[currentFolder davURLAsString])];
+        addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
+                                          [currentFolder davURLAsString])];
   responseValue = [davElementWithContent (@"calendar-free-busy-set", XMLNS_CALDAV, response)
 					 asWebDAVValue];
 
@@ -81,4 +75,37 @@
   return nil;
 }
 
+- (NSArray *) davScheduleDefaultCalendarURL
+{
+  NSArray *response;
+  NSString *personalURL;
+
+  personalURL = [NSString stringWithFormat: @"%@personal/",
+                          [container davURLAsString]];
+  response = [NSArray arrayWithObjects: @"href", XMLNS_WEBDAV, @"D",
+                      personalURL, nil];
+
+  return response;
+}
+
+- (NSArray *) aclsForUser: (NSString *) userID
+{
+  NSString *login;
+  NSArray *acls;
+
+  acls = nil;
+
+  login = [[context activeUser] login];
+  if (![login isEqualToString: owner])
+    {
+      if ([container hasProxyCalendarsWithWriteAccess: YES
+                                     forUserWithLogin: login]
+          || [container hasProxyCalendarsWithWriteAccess: NO
+                                        forUserWithLogin: login])
+        acls = [NSArray arrayWithObject: SOGoRole_AuthorizedSubscriber];
+    }
+
+  return acls;
+}
+
 @end

SoObjects/Appointments/SOGoUserFolder+Appointments.m

@@ -68,7 +68,7 @@
   emails = [[ownerUser allEmails] objectEnumerator];
   while ((currentEmail = [emails nextObject]))
     {
-      tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
+      tag = [NSArray arrayWithObjects: @"href", XMLNS_WEBDAV, @"D",
 		     [NSString stringWithFormat: @"mailto:%@", currentEmail],
 		     nil];
       [addresses addObject: tag];
@@ -94,7 +94,7 @@
   SOGoAppointmentFolders *parent;
 
   parent = [self privateCalendars: @"Calendar" inContext: context];
-  tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
+  tag = [NSArray arrayWithObjects: @"href", XMLNS_WEBDAV, @"D",
                  [parent davURLAsString], nil];
 
   return [NSArray arrayWithObject: tag];
@@ -104,24 +104,14 @@
 {
   SOGoAppointmentFolders *parent;
   NSArray *tag, *response;
-  NSString *parentURL, *login;
+  NSString *parentURL;
 
-  login = [[context activeUser] login];
+  parent = [self privateCalendars: @"Calendar" inContext: context];
-  if ([login isEqualToString: owner])
+  parentURL = [parent davURLAsString];
-    {
+  tag = [NSArray arrayWithObjects: @"href", XMLNS_WEBDAV, @"D",
-      parent = [self privateCalendars: @"Calendar" inContext: context];
+                 [NSString stringWithFormat: @"%@%@/", parentURL, name],
-      parentURL = [parent davURLAsString];
+                 nil];
-
+  response = [NSArray arrayWithObject: tag];
-      if ([parentURL hasSuffix: @"/"])
-        parentURL = [parentURL substringToIndex: [parentURL length]-1];
-  
-      tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-                     [NSString stringWithFormat: @"%@/%@/", parentURL, name],
-                     nil];
-      response = [NSArray arrayWithObject: tag];
-    }
-  else
-    response = nil;
 
   return response;
 }
@@ -193,7 +183,7 @@
       for (count = 0; count < max; count++)
         {
           proxiedUser = [proxiedUsers objectAtIndex: count];
-          tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
+          tag = [NSArray arrayWithObjects: @"href", XMLNS_WEBDAV, @"D",
                          [NSString stringWithFormat: @"/%@/dav/%@/%@/",
                                    appName, proxiedUser, groupId],
                      nil];
@@ -233,7 +223,7 @@
       for (count = 0; count < max; count++)
         {
           proxiedUser = [proxiedUsers objectAtIndex: count];
-          tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
+          tag = [NSArray arrayWithObjects: @"href", XMLNS_WEBDAV, @"D",
                          [NSString stringWithFormat: @"/%@/dav/%@/",
                                    appName, proxiedUser],
                      nil];

SoObjects/Appointments/product.plist

@@ -51,10 +51,10 @@
     };
     SOGoAppointmentInboxFolder = {
       superclass = "SOGoAppointmentFolder";
+      defaultRoles = {
+        "Access Contents Information" = ( "Owner", "AuthorizedSubscriber" );
+      };
     };
-//     SOGoGroupAppointmentFolder = {
-//       superclass = "SOGoAppointmentFolder";
-//     };
     SOGoCalendarComponent = {
       superclass = "SOGoContentObject";
       defaultRoles = {