Fixed diva email authentication for different user from the "FROM" fi…

…eld.
OliveiraLands · Oct 14, 2014 · a75e12c · a75e12c
1 parent d1abfee
commit a75e12c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/addon-modules/Wifi/WebApp/Services.cs b/addon-modules/Wifi/WebApp/Services.cs
@@ -351,7 +351,7 @@ public bool SendEMailSync(string to, string subject, string message)
             try
             {
                 MailMessage msg = new MailMessage();
-                msg.From = new MailAddress(m_WebApp.SmtpUsername);
+                msg.From = new MailAddress(m_WebApp.SmtpFromEmail);
                 msg.To.Add(new MailAddress(to));
                 msg.Subject = "[" + m_WebApp.GridName + "] " + subject;
                 msg.Body = message;
@@ -371,7 +371,7 @@ public bool SendEMail(string to, string subject, string message)
             try
             {
                 MailMessage msg = new MailMessage();
-                msg.From = new MailAddress(m_WebApp.SmtpUsername);
+                msg.From = new MailAddress(m_WebApp.SmtpFromEmail);
                 msg.To.Add(new MailAddress(to));
                 msg.Subject = "[" + m_WebApp.GridName + "] " + subject;
                 msg.Body = message;

diff --git a/addon-modules/Wifi/WebApp/WebApp.cs b/addon-modules/Wifi/WebApp/WebApp.cs
@@ -232,6 +232,12 @@ public string SmtpUsername
             get { return m_SmtpUsername; }
         }
 
+        private string m_SmtpFromEmail;
+        public string SmtpFromEmail
+        {
+            get { return m_SmtpFromEmail; }
+        }
+
         private string m_SmtpPassword;
         public string SmtpPassword
         {
@@ -298,6 +304,7 @@ public void ReadConfigs(IConfigSource config, string configName)
             m_SmtpHost = appConfig.GetString("SmtpHost", "smtp.gmail.com");
             m_SmtpPort = Int32.Parse(appConfig.GetString("SmtpPort", "587"));
             m_SmtpUsername = appConfig.GetString("SmtpUsername", "your_email@gmail.com");
+            m_SmtpFromEmail = appConfig.GetString("SmtpFromEmail", m_SmtpUsername);
             m_SmtpPassword = appConfig.GetString("SmtpPassword", "your_password");
 
             m_AdminFirst = appConfig.GetString("AdminFirst", string.Empty);