Merge pull request #4045 from lambdageek/bug-47867

[mono.git] / mcs / class / System.Web / System.Web.Mail / MailMessageWrapper.cs

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
index 270892aab93cd3c67399b18a83b241210fdf2ea5..3fe644e221f2cc0811a216d1031c0c2229a1ecac 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
@@ -3,9 +3,10 @@
 //
 // Author(s):
 //   Per Arneng <pt99par@student.bth.se>
+//   Sanjay Gupta <gsanjay@novell.com>
 //
+//   (C) 2004, Novell, Inc. (http://www.novell.com)
 //
-
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -37,13 +38,13 @@ namespace System.Web.Mail {
     // addresses instead of a single string
     internal class MailMessageWrapper {
                
-       private MailAddressCollection bcc = new MailAddressCollection();
-       private MailAddressCollection cc = new MailAddressCollection();         
-       private MailAddress from;
-       private MailAddressCollection to = new MailAddressCollection();
-       private MailHeader header = new MailHeader();
-       private MailMessage message;
-       private string body;
+       MailAddressCollection bcc = new MailAddressCollection();
+       MailAddressCollection cc = new MailAddressCollection();
+       MailAddress from;
+       MailAddressCollection to = new MailAddressCollection();
+       MailHeader header = new MailHeader();
+       MailMessage message;
+       string body;
                
        // Constructor          
        public MailMessageWrapper( MailMessage message )
@@ -51,8 +52,8 @@ namespace System.Web.Mail {
            this.message = message;
            
            if( message.From != null ) {
-               from = MailAddress.Parse( message.From );
-               header.From = from.ToString();
+                       from = MailAddress.Parse( message.From );
+                       header.From = from.ToString();
            }
            
            if( message.To != null ) {
@@ -69,8 +70,7 @@ namespace System.Web.Mail {
                bcc = MailAddressCollection.Parse( message.Bcc );
                header.Bcc = bcc.ToString();
            }
-
-           
+   
            // set the subject
            if( message.Subject != null ) {
                
@@ -79,9 +79,7 @@ namespace System.Web.Mail {
                                
                    byte[] subjectBytes = message.BodyEncoding.GetBytes( message.Subject );
                    // encode the subject with Base64
-                   header.Subject = String.Format( "=?{0}?B?{1}?=" , 
-                                                   message.BodyEncoding.BodyName ,
-                                                   Convert.ToBase64String( subjectBytes ) );
+                   header.Subject = "=?" + message.BodyEncoding.BodyName + "?B?" + Convert.ToBase64String (subjectBytes) + "?=";
                } else {
                    
                    header.Subject = message.Subject;
@@ -109,22 +107,18 @@ namespace System.Web.Mail {
 
                    
            // set the content type
-           switch( message.BodyFormat ) {
-               
-           case MailFormat.Html: 
-               header.ContentType = 
-                   String.Format( "text/html; charset=\"{0}\"" , message.BodyEncoding.BodyName ); 
-               break;
-           
-           case MailFormat.Text: 
-               header.ContentType = 
-                   String.Format( "text/plain; charset=\"{0}\"" , message.BodyEncoding.BodyName );
-               break;
-           
-           default: 
-               header.ContentType = 
-                   String.Format( "text/html; charset=\"{0}\"" , message.BodyEncoding.BodyName );
-               break;
+           switch( message.BodyFormat ) {              
+                   case MailFormat.Html: 
+                           header.ContentType = String.Concat ( "text/html; charset=\"", message.BodyEncoding.BodyName, "\""); 
+                           break;
+           
+                   case MailFormat.Text: 
+                           header.ContentType = String.Concat ( "text/plain; charset=\"", message.BodyEncoding.BodyName, "\"");
+                           break;
+           
+                   default: 
+                           header.ContentType = String.Concat ( "text/html; charset=\"", message.BodyEncoding.BodyName, "\"");
+                           break;
            }
            
                    
@@ -163,7 +157,13 @@ namespace System.Web.Mail {
                header.ContentTransferEncoding = "8bit";
            }
 
-           
+           // Add Date header, we were missing earlier 27/08/04
+           // RFC822 requires date to be in format Fri, 27 Aug 2004 20:13:20 +0530
+           //DateTime.Now gives in format 8/27/2004 8:13:00 PM
+           // Need to explore further dateTime formats available or do we need
+           // to write a function to convert.
+               //header.Data.Add ("Date", DateTime.Now.ToString()); 
+
            // Add the custom headers
            foreach( string key in message.Headers.Keys )
                header.Data[ key ] = (string)this.message.Headers[ key ];
@@ -228,18 +228,16 @@ namespace System.Web.Mail {
            get { return message.UrlContentLocation; } 
        }
 
-#if NET_1_1
-       public MailHeader Fields {
-               get {
-                       MailHeader bodyHeaders = new MailHeader();
-                       // Add Fields to MailHeader Object
-                       foreach( string key in message.Fields.Keys )
-                               bodyHeaders.Data[ key ] = (string)this.message.Fields[ key ];
-                       return bodyHeaders;
-               }
-       }
-#endif
-
-    }
+               public MailHeader Fields {
+                       get {
+                                       MailHeader bodyHeaders = new MailHeader();
+                                       // Add Fields to MailHeader Object
+                                       foreach( string key in message.Fields.Keys )
+                                               bodyHeaders.Data[ key ] = this.message.Fields[ key ].ToString();
 
+                                       return bodyHeaders;
+                       }
+                       
+               }
+    }   
 }