X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.Mail%2FSmtpMail.cs;h=0273f6ae1b46c12c499019445a1196bce6b059e0;hb=a9be24c5cdb9e0f6a48dc634ffcf3ad70954fe3e;hp=febb3157ddfe250a52058e838d8c33804195925a;hpb=f64332a41837d1fea966b091f9e837d6a7ff7d17;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
index febb3157ddf..0273f6ae1b4 100644
--- a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
@@ -1,74 +1,112 @@
-//
-// System.Web.Mail.SmtpMail.cs
-//
-// Author:
-//    Lawrence Pit (loz@cable.a2000.nl)
-//    Per Arneng (pt99par@student.bth.se) (SmtpMail.Send)
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Reflection;
-
-namespace System.Web.Mail
-{
-	/// <remarks>
-	/// </remarks>
-	public class SmtpMail
-	{
-		private static string smtpServer;
-		
-		// Constructor		
-		private SmtpMail ()
-		{
-			/* empty */
-		}		
-
-		// Properties
-		public static string SmtpServer {
-			get { return smtpServer; } 
-			set { smtpServer = value; }
-		}
-		
-		
-		public static void Send (MailMessage message) 
-		{
-		 
-		    try {
-			
-			SmtpClient smtp = new SmtpClient (smtpServer);
-			
-			smtp.Send (message);
-			
-			smtp.Close ();
-		    
-		    } catch (SmtpException ex) {
-			// MS implementation throws HttpException
-			// so it is just to follow
-			throw new HttpException (ex.Message);
-		    
-		    } catch (IOException ex) {
-			
-			throw new HttpException (ex.Message);
-			
-		    } catch (Exception ex) { // <<-- Should be fixed
-			
-			throw new HttpException (ex.Message);
-			
-		    }
-		}
-		
-		public static void Send (string from, string to, string subject, string messageText) 
-		{
-			MailMessage message = new MailMessage ();
-			message.From = from;
-			message.To = to;
-			message.Subject = subject;
-			message.Body = messageText;
-			Send (message);
-		}
-	
-	}
-	
-} //namespace System.Web.Mail
+//
+// System.Web.Mail.SmtpMail.cs
+//
+// Author:
+//    Lawrence Pit (loz@cable.a2000.nl)
+//    Per Arneng (pt99par@student.bth.se) (SmtpMail.Send)
+//
+// Copyright (C) 2004-2005 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using System.Security.Permissions;
+
+namespace System.Web.Mail
+{
+	// CAS
+	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+#if NET_2_0
+	[Obsolete ("The recommended alternative is System.Net.Mail.SmtpClient.")]
+#endif
+    	public class SmtpMail
+	{
+		private static string smtpServer = "localhost";
+		
+		// Constructor		
+		private SmtpMail ()
+		{
+			/* empty */
+		}		
+
+		// Properties
+		public static string SmtpServer {
+			get { return smtpServer; } 
+			set { smtpServer = value; }
+		}
+		
+		// Medium (not Minimal) here
+		// http://msdn.microsoft.com/library/en-us/dnpag2/html/paght000017.asp
+		[AspNetHostingPermission (SecurityAction.Demand, Level = AspNetHostingPermissionLevel.Medium)]
+		public static void Send (MailMessage message) 
+		{
+		   		   		    
+		    try {
+			
+			// wrap the MailMessage in a MailMessage wrapper for easier
+			// access to properties and to add some functionality
+			MailMessageWrapper messageWrapper = new MailMessageWrapper( message );
+			
+			SmtpClient smtp = new SmtpClient (smtpServer);
+			
+			smtp.Send (messageWrapper);
+		       
+			smtp.Close ();
+		    
+		    } catch (SmtpException ex) {
+			// LAMESPEC:
+			// .NET sdk throws HttpException
+			// for some reason so to be compatible
+			// we have to do it to :(
+			throw new HttpException (ex.Message, ex);
+		    
+		    } catch (IOException ex) {
+			
+			throw new HttpException (ex.Message, ex);
+			
+		    } catch (FormatException ex) {
+			
+			throw new HttpException (ex.Message, ex);
+		    
+		    } catch (SocketException ex) {
+			
+			throw new HttpException (ex.Message, ex);
+			
+		    }
+		    
+		}
+		
+		public static void Send (string from, string to, string subject, string messageText) 
+		{
+			MailMessage message = new MailMessage ();
+			message.From = from;
+			message.To = to;
+			message.Subject = subject;
+			message.Body = messageText;
+			Send (message);
+		}
+	}
+}