Monotone-Parent: 925d096d1e0f9b05775333d6111c325f69a17ac0

Monotone-Revision: cadb1dbd9d4e2d99af291da99b803238fd438921

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-01-16T18:50:17
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -48,7 +48,6 @@
 #import <SaxObjC/XMLNamespaces.h>
 
 // #import <NGObjWeb/SoClassSecurityInfo.h>
-#import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoCustomGroupFolder.h>
 #import <SOGo/LDAPUserManager.h>
 #import <SOGo/SOGoPermissions.h>
@@ -300,8 +299,8 @@ static NSNumber   *sharedYes = nil;
   [r setStatus: 207];
   [r setContentEncoding: NSUTF8StringEncoding];
   [r setHeader: @"text/xml; charset=\"utf-8\"" forKey: @"content-type"];
-//   [r setHeader: @"no-cache" forKey: @"pragma"];
-//   [r setHeader: @"no-cache" forKey: @"cache-control"];
+  [r setHeader: @"no-cache" forKey: @"pragma"];
+  [r setHeader: @"no-cache" forKey: @"cache-control"];
   [r appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n"];
   [r appendContentString: @"<D:multistatus xmlns:D=\"DAV:\""
      @" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\r\n"];
@@ -404,11 +403,6 @@ static NSNumber   *sharedYes = nil;
         obj = [NSException exceptionWithHTTPStatus:404 /* Not Found */];
     }
 
-  if (obj)
-    [[SOGoCache sharedCache] registerObject: obj
-			     withName: _key
-			     inContainer: container];
-
   return obj;
 }
 

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -126,7 +126,7 @@ static BOOL sendEMailNotifications = NO;
   sm = [SoSecurityManager sharedSecurityManager];
   if (![sm validatePermission: SOGoCalendarPerm_ViewAllComponent
 	   onObject: self inContext: context])
-    iCalString = [record objectForKey: @"c_content"];
+    iCalString = content;
   else if (![sm validatePermission: SOGoCalendarPerm_ViewDAndT
 		onObject: self inContext: context])
     {
@@ -165,7 +165,7 @@ static BOOL sendEMailNotifications = NO;
   if (secure)
     iCalString = [self secureContentAsString];
   else
-    iCalString = [record objectForKey: @"c_content"];
+    iCalString = content;
 
   if ([iCalString length] > 0)
     calendar = [iCalCalendar parseSingleFromSource: iCalString];