From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 31 Jan 2005 00:48:13 +0000 (+0000)
Subject: fixed support for embedded message/rfc822 attachments (properly handle body-parts)
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69d1b3ddf729e395999d54254dee8b7b0de43869;p=scalable-opengroupware.org

fixed support for embedded message/rfc822 attachments (properly handle body-parts)


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

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 8c594df0..0288835c 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,4 +1,22 @@
+2005-01-31  Helge Hess  <helge.hess@opengroupware.org>
+
+	* v0.9.84
+
+	* UIxMailView.m: properly recurse into message/rfc822 bodies for flat
+	  content fetches
+
+	* UIxMailView.m, UIxMailPartMessageViewer.m: added links for email
+	  addresses (currently mailto://)
+
 2005-01-30  Helge Hess  <helge.hess@opengroupware.org>
+	
+	* v0.9.83
+	
+	* UIxMailRenderingContext.m: activate UIxMailPartMessageViewer for
+	  message/rfc822 contents
+
+	* added a UIxMailPartMessageViewer for displaying embedded (eg
+	  forwarded) MIME messages
 
 	* v0.9.82
 	
diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index c9154123..cf6481f1 100644
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -42,6 +42,7 @@ MailerUI_OBJC_FILES += \
 	UIxMailPartLinkViewer.m		\
 	UIxMailPartMixedViewer.m	\
 	UIxMailPartAlternativeViewer.m	\
+	UIxMailPartMessageViewer.m	\
 	\
 	UIxFilterList.m			\
 	UIxSieveEditor.m		\
@@ -75,6 +76,7 @@ MailerUI_RESOURCE_FILES += \
 	UIxMailPartImageViewer.wox	\
 	UIxMailPartLinkViewer.wox	\
 	UIxMailPartAlternativeViewer.wox\
+	UIxMailPartMessageViewer.wox	\
 	\
 	UIxFilterList.wox		\
 	UIxSieveEditor.wox		\
diff --git a/SOGo/UI/Mailer/README b/SOGo/UI/Mailer/README
index 01404aed..96ab0eef 100644
--- a/SOGo/UI/Mailer/README
+++ b/SOGo/UI/Mailer/README
@@ -39,6 +39,9 @@ Bodystructures
 
 Multiparts: multipart/MIXED, multipart/SIGNED
 
+Feature: we fetch all plain/text bodies in a single run by traversing the
+         body structure.
+
 Sample Bodystructure (GPG):
 ---snip---
   {
diff --git a/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m b/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m
index 4a949646..b12ae817 100644
--- a/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m
+++ b/SOGo/UI/Mailer/UIxEnvelopeAddressFormatter.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2004 SKYRIX Software AG
+  Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of OpenGroupware.org.
 
@@ -114,7 +114,7 @@ static Class StrClass     = Nil;
   
   if ([_address isKindOfClass:[NSArray class]])
     return [self stringForArray:_address];
-  
+
   [self debugWithFormat:
 	  @"NOTE: unexpected object for envelope formatter: %@<%@>",
 	  _address, NSStringFromClass([_address class])];
diff --git a/SOGo/UI/Mailer/UIxMailPartLinkViewer.m b/SOGo/UI/Mailer/UIxMailPartLinkViewer.m
index 16574e1b..41d95c32 100644
--- a/SOGo/UI/Mailer/UIxMailPartLinkViewer.m
+++ b/SOGo/UI/Mailer/UIxMailPartLinkViewer.m
@@ -51,10 +51,6 @@
 
 @implementation UIxMailPartLinkViewer
 
-- (void)dealloc {
-  [super dealloc];
-}
-
 /* URLs */
 
 - (NSString *)pathToAttachment {
diff --git a/SOGo/UI/Mailer/UIxMailPartLinkViewer.wox b/SOGo/UI/Mailer/UIxMailPartLinkViewer.wox
index 6d1b89cd..72528b40 100644
--- a/SOGo/UI/Mailer/UIxMailPartLinkViewer.wox
+++ b/SOGo/UI/Mailer/UIxMailPartLinkViewer.wox
@@ -15,8 +15,10 @@
       <var:string label:value="Size" />:
       <var:string value="bodyInfo.size" formatter="sizeFormatter" />
     </div>
-  
+
 <!-- debug
+    <pre><var:string value="bodyInfo"/></pre>
+  
     <a var:href="pathToAttachment"
        var:title="bodyInfo"
        class="mailer_imagecontent"
diff --git a/SOGo/UI/Mailer/UIxMailPartMessageViewer.m b/SOGo/UI/Mailer/UIxMailPartMessageViewer.m
new file mode 100644
index 00000000..9ea0aca0
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailPartMessageViewer.m
@@ -0,0 +1,156 @@
+/*
+  Copyright (C) 2004-2005 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo 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 Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+
+#include "UIxMailPartViewer.h"
+
+/*
+  UIxMailPartMessageViewer
+
+  Show message/rfc822 mail parts. Note that the IMAP4 server already returns a
+  proper body structure of the message.
+
+  Relevant body-info keys:
+    to/sender/from/cc/bcc/in-reply-to/reply-to - array of addr-dicts
+    type/subtype          - message/RFC822
+    size
+    subject
+    parameterList         - dict (eg 'name')
+    messageId     
+    date
+    encoding              - 7BIT
+    bodyLines             - 83
+    bodyId                - (empty string?)
+    description           - (empty string?, content-description?)
+    
+    body                  - a body structure?
+  
+  Addr-Dict:
+    hostName / mailboxName / personalName / sourceRoute
+*/
+
+@class NGImap4Envelope;
+
+@interface UIxMailPartMessageViewer : UIxMailPartViewer
+{
+  NGImap4Envelope *envelope;
+  id currentAddress;
+}
+
+@end
+
+#include "WOContext+UIxMailer.h"
+#include "UIxMailRenderingContext.h"
+#include <NGImap4/NGImap4Envelope.h>
+#include <NGImap4/NGImap4EnvelopeAddress.h>
+#include "common.h"
+
+@implementation UIxMailPartMessageViewer
+
+- (void)dealloc {
+  [self->currentAddress release];
+  [self->envelope       release];
+  [super dealloc];
+}
+
+/* cache maintenance */
+
+- (void)resetBodyInfoCaches {
+  [super resetBodyInfoCaches];
+  [self->envelope       release]; self->envelope       = nil;
+  [self->currentAddress release]; self->currentAddress = nil;
+}
+
+/* notifications */
+
+- (void)sleep {
+  [self->currentAddress release]; self->currentAddress = nil;
+  [super sleep];
+}
+
+/* accessors */
+
+- (void)setCurrentAddress:(id)_addr {
+  ASSIGN(self->currentAddress, _addr);
+}
+- (id)currentAddress {
+  return self->currentAddress;
+}
+
+/* nested body structure */
+
+- (id)contentInfo {
+  return [[self bodyInfo] valueForKey:@"body"];
+}
+
+- (id)contentPartPath {
+  /*
+    Path processing is a bit weird in the context of message/rfc822. If we have
+    a multipart, the multipart itself has no own identifier! Instead the
+    children of the multipart are directly mapped into the message namespace.
+    
+    If the message has just a plain content, ids seems to be as expected (that
+    is, its just a "1").
+  */
+  NSArray  *pp;
+  NSString *mt;
+  
+  mt = [[[self contentInfo] valueForKey:@"type"] lowercaseString];
+  if ([mt isEqualToString:@"multipart"])
+    return [self partPath];
+  
+  pp = [self partPath];
+  return [pp count] > 0
+    ? [pp arrayByAddingObject:@"1"]
+    : [NSArray arrayWithObject:@"1"];
+}
+
+- (id)contentViewerComponent {
+  id info;
+  
+  info = [self contentInfo];
+  return [[[self context] mailRenderingContext] viewerForBodyInfo:info];
+}
+
+/* generating envelope */
+
+- (NGImap4Envelope *)envelope {
+  if (self->envelope == nil) {
+    self->envelope = [[NGImap4Envelope alloc] initWithBodyStructureInfo:
+						[self bodyInfo]];
+  }
+  return self->envelope;
+}
+
+/* links to recipients */
+
+- (NSString *)linkToEnvelopeAddress:(NGImap4EnvelopeAddress *)_address {
+  // TODO: make some web-link, eg open a new compose panel?
+  return [@"mailto:" stringByAppendingString:[_address baseEMail]];
+}
+
+- (NSString *)fromLink {
+  return [self linkToEnvelopeAddress:[[self envelope] from]];
+}
+- (NSString *)currentAddressLink {
+  return [self linkToEnvelopeAddress:[self currentAddress]];
+}
+
+@end /* UIxMailPartMessageViewer */
diff --git a/SOGo/UI/Mailer/UIxMailPartMessageViewer.wox b/SOGo/UI/Mailer/UIxMailPartMessageViewer.wox
new file mode 100644
index 00000000..6388d709
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailPartMessageViewer.wox
@@ -0,0 +1,77 @@
+<?xml version="1.0" standalone="yes"?>
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:var="http://www.skyrix.com/od/binding"
+     class="linked_attachment_frame"
+>
+  <div class="linked_attachment_body">
+
+  <!-- TODO: the table is a DUP to UIxMailView, own component? -->
+  <table class="mailer_fieldtable">
+    <tr class="mailer_fieldrow">
+      <td class="mailer_fieldname" ><var:string label:value="Subject"/>:</td>
+      <td class="mailer_subjectfieldvalue">
+        <var:string value="envelope.subject"
+                    formatter="context.mailSubjectFormatter"/>
+<!--
+        <a var:href="pathToAttachment"
+           var:title="filenameForDisplay"
+           >(<var:string label:value="download" />)</a>
+-->
+      </td>
+    </tr>
+    <tr class="mailer_fieldrow">
+      <td class="mailer_fieldname" ><var:string label:value="From"/>:</td>
+      <td class="mailer_fieldvalue">
+        <!-- compose link? -->
+        <a var:href="fromLink">
+          <var:string value="envelope.from"
+               formatter="context.mailEnvelopeFullAddressFormatter" /></a>
+      </td>
+    </tr>
+    <tr class="mailer_fieldrow">
+      <td class="mailer_fieldname" ><var:string label:value="Date"/>:</td>
+      <td class="mailer_fieldvalue">
+        <var:string value="envelope.date" 
+                    formatter="context.mailDateFormatter"/>
+      </td>
+    </tr>
+
+    <tr class="mailer_fieldrow">
+      <td class="mailer_fieldname" ><var:string label:value="To"/>:</td>
+      <td class="mailer_fieldvalue">
+        <!-- compose link? -->
+        <var:foreach list="envelope.to" item="currentAddress">
+          <a var:href="currentAddressLink">
+            <var:string value="currentAddress"
+                 formatter="context.mailEnvelopeFullAddressFormatter" /></a>
+        </var:foreach>
+      </td>
+    </tr>
+    <var:if condition="envelope.hasCC">
+      <tr class="mailer_fieldrow">
+        <td class="mailer_fieldname" ><var:string label:value="CC"/>:</td>
+        <td class="mailer_fieldvalue">
+          <!-- compose link? -->
+          <var:foreach list="envelope.cc" item="currentAddress">
+          <a var:href="currentAddressLink">
+              <var:string value="currentAddress"
+                   formatter="context.mailEnvelopeFullAddressFormatter" /></a>
+            <br /> <!-- TODO: better to use li+CSS -->
+          </var:foreach>
+        </td>
+      </tr>
+    </var:if>
+  </table>
+  
+  <div class="mailer_mailcontent">
+    <var:component value="contentViewerComponent"
+                   bodyInfo="contentInfo" 
+                   partPath="contentPartPath" />
+  </div>
+
+<!-- debug
+    <pre><var:string value="envelope"/></pre>
+    <pre><var:string value="bodyInfo.body"/></pre>
+-->
+  </div>
+</div>
diff --git a/SOGo/UI/Mailer/UIxMailPartViewer.m b/SOGo/UI/Mailer/UIxMailPartViewer.m
index 07fc1b34..c753854a 100644
--- a/SOGo/UI/Mailer/UIxMailPartViewer.m
+++ b/SOGo/UI/Mailer/UIxMailPartViewer.m
@@ -108,7 +108,8 @@
   NSData   *content;
   
   if ((content = [self decodedFlatContent]) == nil) {
-    [self errorWithFormat:@"got no text content: %@", [self partPath]];
+    [self errorWithFormat:@"got no text content: %@", 
+	    [[self partPath] componentsJoinedByString:@"."]];
     return nil;
   }
   
diff --git a/SOGo/UI/Mailer/UIxMailRenderingContext.h b/SOGo/UI/Mailer/UIxMailRenderingContext.h
index e58aeec7..227622c9 100644
--- a/SOGo/UI/Mailer/UIxMailRenderingContext.h
+++ b/SOGo/UI/Mailer/UIxMailRenderingContext.h
@@ -44,6 +44,7 @@
   WOComponent *textViewer;
   WOComponent *imageViewer;
   WOComponent *linkViewer;
+  WOComponent *messageViewer;
 }
 
 - (id)initWithViewer:(WOComponent *)_viewer context:(WOContext *)_ctx;
diff --git a/SOGo/UI/Mailer/UIxMailRenderingContext.m b/SOGo/UI/Mailer/UIxMailRenderingContext.m
index 3885512a..758b4992 100644
--- a/SOGo/UI/Mailer/UIxMailRenderingContext.m
+++ b/SOGo/UI/Mailer/UIxMailRenderingContext.m
@@ -41,10 +41,11 @@
 
 - (void)dealloc {
   [self->alternativeViewer release];
-  [self->mixedViewer release];
-  [self->textViewer  release];
-  [self->imageViewer release];
-  [self->linkViewer  release];
+  [self->mixedViewer   release];
+  [self->textViewer    release];
+  [self->imageViewer   release];
+  [self->linkViewer    release];
+  [self->messageViewer release];
   [super dealloc];
 }
 
@@ -57,6 +58,7 @@
   [self->textViewer        release]; self->textViewer        = nil;
   [self->imageViewer       release]; self->imageViewer       = nil;
   [self->linkViewer        release]; self->linkViewer        = nil;
+  [self->messageViewer     release]; self->messageViewer     = nil;
 }
 
 /* fetching */
@@ -119,6 +121,14 @@
   return self->linkViewer;
 }
 
+- (WOComponent *)messageViewer {
+  if (self->messageViewer == nil) {
+    self->messageViewer = 
+      [[self->viewer pageWithName:@"UIxMailPartMessageViewer"] retain];
+  }
+  return self->messageViewer;
+}
+
 - (WOComponent *)viewerForBodyInfo:(id)_info {
   NSString *mt, *st;
 
@@ -141,9 +151,11 @@
   }
   else if ([mt isEqualToString:@"image"])
     return [self imageViewer];
+  else if ([mt isEqualToString:@"message"] && [st isEqualToString:@"rfc822"])
+    return [self messageViewer];
   else if ([mt isEqualToString:@"application"]) {
     /*
-      octed-stream (generate download link?)
+      octet-stream (generate download link?, autodetect type?)
       pgp-viewer
     */
   }
diff --git a/SOGo/UI/Mailer/UIxMailView.m b/SOGo/UI/Mailer/UIxMailView.m
index 204419f7..ec6754fd 100644
--- a/SOGo/UI/Mailer/UIxMailView.m
+++ b/SOGo/UI/Mailer/UIxMailView.m
@@ -34,6 +34,7 @@
 #include "WOContext+UIxMailer.h"
 #include <SoObjects/Mailer/SOGoMailObject.h>
 #include <NGImap4/NGImap4Envelope.h>
+#include <NGImap4/NGImap4EnvelopeAddress.h>
 #include "common.h"
 
 @implementation UIxMailView
@@ -71,6 +72,21 @@
   return s;
 }
 
+/* links (DUP to UIxMailPartViewer!) */
+
+- (NSString *)linkToEnvelopeAddress:(NGImap4EnvelopeAddress *)_address {
+  // TODO: make some web-link, eg open a new compose panel?
+  return [@"mailto:" stringByAppendingString:[_address baseEMail]];
+}
+
+- (NSString *)fromLink {
+  return [self linkToEnvelopeAddress:
+		 [[self clientObject] fromEnvelopeAddress]];
+}
+- (NSString *)currentAddressLink {
+  return [self linkToEnvelopeAddress:[self currentAddress]];
+}
+
 /* fetching */
 
 - (id)message {
@@ -98,6 +114,7 @@
   NSArray  *parts;
   unsigned i, count;
   BOOL fetchPart;
+  id body;
   
   fetchPart = [self shouldFetchPartOfType:[_info valueForKey:@"type"]
 		    subtype:[_info valueForKey:@"subtype"]];
@@ -133,6 +150,19 @@
     
     [self addRequiredKeysOfStructure:childInfo path:sp toArray:_keys];
   }
+  
+  /* check body */
+  
+  if ((body = [_info objectForKey:@"body"]) != nil) {
+    NSString *sp;
+
+    sp = [[body valueForKey:@"type"] lowercaseString];
+    if ([sp isEqualToString:@"multipart"])
+      sp = _p;
+    else
+      sp = [_p length] > 0 ? [_p stringByAppendingString:@".1"] : @"1";
+    [self addRequiredKeysOfStructure:body path:sp toArray:_keys];
+  }
 }
 
 - (NSArray *)contentFetchKeys {
diff --git a/SOGo/UI/Mailer/UIxMailView.wox b/SOGo/UI/Mailer/UIxMailView.wox
index 80514f10..bcd92b1d 100644
--- a/SOGo/UI/Mailer/UIxMailView.wox
+++ b/SOGo/UI/Mailer/UIxMailView.wox
@@ -25,8 +25,7 @@
     <tr class="mailer_fieldrow">
       <td class="mailer_fieldname" ><var:string label:value="From"/>:</td>
       <td class="mailer_fieldvalue">
-        <!-- compose link? -->
-        <a href="#">
+        <a var:href="fromLink">
           <var:string value="clientObject.fromEnvelopeAddress"
                formatter="context.mailEnvelopeFullAddressFormatter" /></a>
       </td>
@@ -46,10 +45,9 @@
     <tr class="mailer_fieldrow">
       <td class="mailer_fieldname" ><var:string label:value="To"/>:</td>
       <td class="mailer_fieldvalue">
-        <!-- compose link? -->
         <var:foreach list="clientObject.toEnvelopeAddresses"
                      item="currentAddress">
-          <a href="#">
+          <a var:href="currentAddressLink">
             <var:string value="currentAddress"
                  formatter="context.mailEnvelopeFullAddressFormatter" /></a>
         </var:foreach>
@@ -59,10 +57,9 @@
       <tr class="mailer_fieldrow">
         <td class="mailer_fieldname" ><var:string label:value="CC"/>:</td>
         <td class="mailer_fieldvalue">
-          <!-- compose link? -->
           <var:foreach list="clientObject.ccEnvelopeAddresses" 
                        item="currentAddress">
-            <a href="#">
+            <a var:href="currentAddressLink">
               <var:string value="currentAddress"
                    formatter="context.mailEnvelopeFullAddressFormatter" /></a>
             <br /> <!-- TODO: better to use li+CSS -->
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 06f04de4..73d914ae 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,7 +1,8 @@
 # version file
 
-SUBMINOR_VERSION:=82
+SUBMINOR_VERSION:=84
 
+# v0.9.84 requires libNGMime        v4.5.209
 # v0.9.81 requires SoObjects/Sieve  v0.9.5
 # v0.9.80 requires SoObjects/Mailer v0.9.59
 # v0.9.78 requires SoObjects/Mailer v0.9.58