Author: igorz
Date: 2007-02-26 07:19:53 -0500 (Mon, 26 Feb 2007)
New Revision: 73420

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserWizard.cs
Log:
2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>

        * CreateUserWizard.cs: fixed: does not attempt to send email if 
        MailDefinition is not defined.


Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-02-26 10:21:12 UTC (rev 73419)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-02-26 12:19:53 UTC (rev 73420)
@@ -1,5 +1,10 @@
 2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
 
+       * CreateUserWizard.cs: fixed: does not attempt to send email if 
+       MailDefinition is not defined.
+
+2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
+
        * Login.cs: fixed:
        considers FormsAuthentication.ReturnUrl only if is placed in 
        the login page defined in web.config. 

Modified: 
trunk/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserWizard.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserWizard.cs    
2007-02-26 10:21:12 UTC (rev 73419)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserWizard.cs    
2007-02-26 12:19:53 UTC (rev 73420)
@@ -1531,8 +1531,8 @@
                                UserName, Password, Email, Question, Answer, 
!DisableCreatedUser, null, out status);
 
                        if ((newUser != null) && (status == 
MembershipCreateStatus.Success)) {
-                               OnCreatedUser (new EventArgs ());
-                               SendPasswordByMail(UserName, Password);
+                               OnCreatedUser (new EventArgs ());
+                               SendPasswordByMail (newUser, Password);
                                return true;
                        }
 
@@ -1574,18 +1574,20 @@
                        OnCreateUserError (new CreateUserErrorEventArgs 
(status));
 
                        return false;
-               }
-
-               private void SendPasswordByMail (string username, string 
password)
-               {
-                       MembershipUser user = 
MembershipProviderInternal.GetUser (UserName, false);
+               }
+
+               private void SendPasswordByMail (MembershipUser user, string 
password)
+               {
                        if (user == null)
                                return;
+                       
+                       if (_mailDefinition == null)
+                               return;
                        
                        string messageText = "A new account has been created 
for you. Please go to the site and log in using the following 
information.\nUser Name: <%USERNAME%>\nPassword: <%PASSWORD%>";
 
-                       ListDictionary dictionary = new ListDictionary ();
-                       dictionary.Add ("<%USERNAME%>", username);
+                       ListDictionary dictionary = new ListDictionary ();
+                       dictionary.Add ("<%USERNAME%>", user.UserName);
                        dictionary.Add ("<%PASSWORD%>", password);
 
                        MailMessage message = null;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to