Monotone-Parent: 3beea562a57fe58bc0ec7f6ec1ea8b43840f6655

Monotone-Revision: d5bcd77c68cb679b5a1b9a23a4cc86038b0e615e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-22T18:43:08
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/GNUmakefile

@@ -23,6 +23,7 @@ Mailer_OBJC_FILES += \
 	SOGoTrashFolder.m		\
 	\
 	SOGoMailBodyPart.m		\
+	SOGoHTMLMailBodyPart.m		\
 	SOGoImageMailBodyPart.m		\
 	SOGoMessageMailBodyPart.m	\
 	SOGoCalendarMailBodyPart.m	\

SoObjects/Mailer/SOGoHTMLMailBodyPart.m

@@ -0,0 +1,62 @@
+/* SOGoHTMLMailBodyPart.m - this file is part of SOGo
+ *
+ * Copyright (C) 2008 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSString.h>
+
+#import <NGObjWeb/SoClass.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/WORequest+So.h>
+
+#import <SOGo/NSString+Utilities.h>
+
+#import "SOGoMailBodyPart.h"
+
+@interface SOGoHTMLMailBodyPart : SOGoMailBodyPart
+
+@end
+
+@implementation SOGoHTMLMailBodyPart
+
+- (id) GETAction: (id) localContext
+{
+  WORequest *request;
+  NSString *uri;
+  id response;
+
+  request = [localContext request];
+  if ([request isSoWebDAVRequest])
+    response = [super GETAction: localContext];
+  else
+    {
+      response = [localContext response];
+      uri = [[request uri] composeURLWithAction: @"view"
+			   parameters: [request formValues]
+			   andHash: NO];
+      [response setStatus: 302 /* moved */];
+      [response setHeader: uri forKey: @"location"];
+    }
+
+  return response;
+}
+
+@end

SoObjects/Mailer/SOGoMailBodyPart.m

@@ -353,57 +353,58 @@ static BOOL debugOn = NO;
 
 /* actions */
 
-- (id)GETAction:(id)_ctx {
+- (id) GETAction: (WOContext *) localContext
+{
   NSException *error;
-  WOResponse *r;
   NSData     *data;
   NSString   *etag, *mimeType, *fileName;
+  id response;
   
-  if ((error = [self matchesRequestConditionInContext:_ctx]) != nil) {
-    // TODO: currently we fetch the body structure to get here - check this!
-    /* check whether the mail still exists */
-    if (![[self mailObject] doesMailExist]) {
-      return [NSException exceptionWithHTTPStatus:404 /* Not Found */
-			  reason:@"mail was deleted"];
+  error = [self matchesRequestConditionInContext: localContext];
+  if (error)
+    {
+      response = error; /* return 304 or 416 */
     }
-    return error; /* return 304 or 416 */
-  }
-
-  [self debugWithFormat:@"should fetch body part: %@", 
-	  [self bodyPartIdentifier]];
-  
-  if ((data = [self fetchBLOB]) == nil) {
-    return [NSException exceptionWithHTTPStatus:404 /* not found */
-			reason:@"did not find body part"];
-  }
-  
-  [self debugWithFormat:@"  fetched %d bytes: %@", [data length],
-	[self partInfo]];
+  else
+    {
+//   [self debugWithFormat: @"should fetch body part: %@", 
+// 	[self bodyPartIdentifier]];
+      data = [self fetchBLOB];
+      if (data)
+	{
+//   [self debugWithFormat:@"  fetched %d bytes: %@", [data length],
+// 	[self partInfo]];
   
   // TODO: wrong, could be encoded
-  r = [(WOContext *)_ctx response];
-  mimeType = [self davContentType];
-  if ([mimeType isEqualToString: @"application/x-xpinstall"])
-    mimeType = @"application/octet-stream";
-
-  [r setHeader: mimeType forKey:@"content-type"];
-  [r setHeader: [NSString stringWithFormat:@"%d", [data length]]
-     forKey: @"content-length"];
+	  response = [localContext response];
+	  mimeType = [self davContentType];
+	  if ([mimeType isEqualToString: @"application/x-xpinstall"])
+	    mimeType = @"application/octet-stream";
+	  
+	  [response setHeader: mimeType forKey: @"content-type"];
+	  [response setHeader: [NSString stringWithFormat:@"%d", [data length]]
+		    forKey: @"content-length"];
   
-  if (asAttachment)
-    {
-      fileName = [self filename];
-      if ([fileName length])
-	[r setHeader: [NSString stringWithFormat: @"attachment; filename=%@", fileName]
-	   forKey: @"content-disposition"];
+	  if (asAttachment)
+	    {
+	      fileName = [self filename];
+	      if ([fileName length])
+		[response setHeader: [NSString stringWithFormat: @"attachment; filename=%@", fileName]
+			  forKey: @"content-disposition"];
+	    }
+
+	  etag = [self davEntityTag];
+	  if (etag)
+	    [response setHeader: etag forKey: @"etag"];
+	  
+	  [response setContent: data];
+	}
+      else
+	response = [NSException exceptionWithHTTPStatus: 404 /* not found */
+				reason: @"did not find body part"];
     }
 
-  if ((etag = [self davEntityTag]) != nil)
-    [r setHeader:etag forKey:@"etag"];
-
-  [r setContent:data];
-
-  return r;
+  return response;
 }
 
 /* factory */
@@ -454,6 +455,8 @@ static BOOL debugOn = NO;
   else if ([mimeType isEqualToString: @"text/calendar"]
 	   || [mimeType isEqualToString: @"application/ics"])
     classString = @"SOGoCalendarMailBodyPart";
+  else if ([mimeType isEqualToString: @"text/html"])
+    classString = @"SOGoHTMLMailBodyPart";
   else if ([mimeType isEqualToString: @"text/x-vcard"])
     classString = @"SOGoVCardMailBodyPart";
   else if ([mimeType isEqualToString: @"message/rfc822"])

SoObjects/Mailer/product.plist

@@ -58,6 +58,9 @@
     SOGoMailBodyPart = {
       superclass    = "SOGoMailBaseObject";
     };
+    SOGoHTMLMailBodyPart = {
+      superclass    = "SOGoMailBodyPart";
+    };
     SOGoImageMailBodyPart = {
       superclass    = "SOGoMailBodyPart";
     };

SoObjects/SOGo/SOGoObject.m

@@ -878,7 +878,7 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
   NSException *error;
   id value;
 
-  request = [localContext request];  
+  request = [localContext request];
   if ([request isSoWebDAVRequest])
     {
       if ([self respondsToSelector: @selector (contentAsString)])