Monotone-Parent: 678f408cc158a19d36fc3c0d6f53b3434a652542

Monotone-Revision: 645b1645665a00c2914161e8e43c5c8917f22935

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-11T19:36:40
Monotone-Branch: ca.inverse.sogo

UI/Common/UIxFolderActions.m

@@ -37,6 +37,8 @@
 #import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
+#import "WODirectAction+SOGo.h"
+
 #import "UIxFolderActions.h"
 
 @implementation UIxFolderActions
@@ -89,10 +91,9 @@
   NSMutableDictionary *folderSubscription;
   NSString *mailInvitationURL;
 
-  response = [context response];
   if ([owner isEqualToString: login])
     {
-      [response setStatus: 403];
+      response = [self responseWithStatus: 403];
       [response appendContentString:
 		 @"You cannot (un)subscribe to a folder that you own!"];
     }
@@ -119,12 +120,12 @@
 	  mailInvitationURL
 	    = [[clientObject soURLToBaseContainerForCurrentUser]
 		absoluteString];
-	  [response setStatus: 302];
+	  response = [self responseWithStatus: 302];
 	  [response setHeader: mailInvitationURL
 		    forKey: @"location"];
 	}
       else
-	[response setStatus: 204];
+	response = [self responseWith204];
     }
 
   return response;
@@ -162,22 +163,14 @@
 
 - (WOResponse *) canAccessContentAction
 {
-  WOResponse *response;
-
-  response = [context response];
-  [response setStatus: 204];
-
-  return response;
+  return [self responseWith204];
 }
 
 - (WOResponse *) _realFolderActivation: (BOOL) makeActive
 {
-  WOResponse *response;
   NSMutableDictionary *folderSubscription, *folderDict;
   NSNumber *active;
   
-  response = [context response];
-
   [self _setupContext];
   active = [NSNumber numberWithBool: makeActive];
   if ([owner isEqualToString: login])
@@ -196,9 +189,8 @@
     }
 
   [ud synchronize];
-  [response setStatus: 204];
 
-  return response;
+  return [self responseWith204];
 }
 
 - (WOResponse *) activateFolderAction

UI/MainUI/SOGoRootPage.m

@@ -69,7 +69,7 @@
 
   auth = [[WOApplication application]
 	   authenticatorInContext: context];
-  response = [context response];
+  response = [self responseWith204];
   cookieString = [NSString stringWithFormat: @"%@:%@",
 			   [self queryParameterForKey: @"userName"],
 			   [self queryParameterForKey: @"password"]];
@@ -78,7 +78,6 @@
   authCookie = [WOCookie cookieWithName: [auth cookieNameInContext: context]
 			 value: cookieValue];
   [authCookie setPath: @"/"];
-  [response setStatus: 204];
   [response addCookie: authCookie];
 
   return response;

UI/Scheduler/UIxCalListingActions.m

@@ -39,6 +39,8 @@
 #import <SoObjects/SOGo/NSObject+Utilities.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
 
+#import <UI/Common/WODirectAction+SOGo.h>
+
 #import "NSArray+Scheduler.h"
 
 #import "UIxCalListingActions.h"
@@ -289,10 +291,9 @@
 {
   WOResponse *response;
 
-  response = [context response];
+  response = [self responseWithStatus: 200];
   [response setHeader: @"text/plain; charset=utf-8"
 	    forKey: @"content-type"];
-  [response setStatus: 200];
   [response appendContentString: [data jsonRepresentation]];
 
   return response;