From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 18 Jul 2005 12:11:32 +0000 (+0000)
Subject: added some support for multipart/report
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1346eb028caac04381e0c25875e79e3f61ef9856;p=scalable-opengroupware.org

added some support for multipart/report


git-svn-id: http://svn.opengroupware.org/SOGo/trunk@786 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/UI/MailPartViewers/ChangeLog b/SOGo/UI/MailPartViewers/ChangeLog
index 673cd7d4..8dd8b803 100644
--- a/SOGo/UI/MailPartViewers/ChangeLog
+++ b/SOGo/UI/MailPartViewers/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-18  Helge Hess  <helge.hess@opengroupware.org>
 
+	* UIxMailRenderingContext.m: map multipart/report mimetype to use the
+	  multipart/mixed viewer, map message/delivery-status mimetype to use
+	  the link viewer (v0.9.15)
+
 	* v0.9.14
 
 	* UIxMailPartICalViewer.m: replaced some methods with label bindings
diff --git a/SOGo/UI/MailPartViewers/UIxMailRenderingContext.m b/SOGo/UI/MailPartViewers/UIxMailRenderingContext.m
index a058fc9f..b4cc2ba0 100644
--- a/SOGo/UI/MailPartViewers/UIxMailRenderingContext.m
+++ b/SOGo/UI/MailPartViewers/UIxMailRenderingContext.m
@@ -156,6 +156,10 @@
       return [self signedViewer];
     if ([st isEqualToString:@"alternative"])
       return [self alternativeViewer];
+    
+    if ([st isEqualToString:@"report"])
+      /* this is used by mail-delivery reports */
+      return [self mixedViewer];
   }
   else if ([mt isEqualToString:@"text"]) {
     if ([st isEqualToString:@"plain"])
@@ -171,6 +175,24 @@
     return [self imageViewer];
   else if ([mt isEqualToString:@"message"] && [st isEqualToString:@"rfc822"])
     return [self messageViewer];
+  else if ([mt isEqualToString:@"message"] && 
+	   [st isEqualToString:@"delivery-status"]) {
+    /*
+      Content-Description: Delivery error report
+      Content-Type: message/delivery-status
+      
+      Reporting-MTA: dns; mail.opengroupware.org
+      Arrival-Date: Mon, 18 Jul 2005 12:08:43 +0200 (CEST)
+      
+      Final-Recipient: rfc822; ioioi@plop.com
+      Action: failed
+      Status: 5.0.0
+      Diagnostic-Code: X-Postfix; host plop.com[64.39.31.55] said: 550 5.7.1
+          <ioioi@plop.com>... Relaying denied
+    */
+    // Note: we cannot use the text viewer because the body is not pre-fetched
+    return [self linkViewer];
+  }
   else if ([mt isEqualToString:@"application"]) {
     // octet-stream (generate download link?, autodetect type?)
     
diff --git a/SOGo/UI/MailPartViewers/Version b/SOGo/UI/MailPartViewers/Version
index c2888967..eaf1bd34 100644
--- a/SOGo/UI/MailPartViewers/Version
+++ b/SOGo/UI/MailPartViewers/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15
 
 # v0.9.0 requires libNGiCal v4.5.53
 # v0.9.1 requires libNGMime v4.5.213