X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.Mail%2FSmtpMail.cs;h=3085a930752e064d21b8e45383793e6e4d0f7acc;hb=355d2c5eca6ec320ccd4097d7f196b26a721ea94;hp=6bb50ceffd8a55c44675d89210321ad73f2aa8a3;hpb=6b6435d1b3206b0162c37e5ecce8d9a699fe6467;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 6bb50ceffd8..3085a930752 100644
--- a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
@@ -1,11 +1,11 @@
-//
-// System.Web.Mail.SmtpMail.cs
-//
-// Author:
-//    Lawrence Pit (loz@cable.a2000.nl)
-//    Per Arneng (pt99par@student.bth.se) (SmtpMail.Send)
-//
-
+//
+// 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
@@ -26,83 +26,83 @@
 // 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;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.IO;
-using System.Reflection;
-
-namespace System.Web.Mail
-{
-	/// <remarks>
-	/// </remarks>
-	public class SmtpMail
-	{
-		private static string smtpServer = "localhost";
-		
-		// Constructor		
-		private SmtpMail ()
-		{
-			/* empty */
-		}		
-
-		// Properties
-		public static string SmtpServer {
-			get { return smtpServer; } 
-			set { smtpServer = value; }
-		}
-		
-		
-		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);
-		}
-	
-	}
-	
-} //namespace System.Web.Mail
+
+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
+	[Obsolete ("The recommended alternative is System.Net.Mail.SmtpClient. http://go.microsoft.com/fwlink/?linkid=14202")]
+    	public class SmtpMail
+	{
+		static string smtpServer = "localhost";
+		
+		// Constructor
+		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);
+		}
+	}
+}