From dc114ffc5a136e528bc64413f4c58cf2eb9d9e09 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 9 Jul 2013 10:28:57 +0530 Subject: [PATCH] [email] force use of loginid as the sender --- webnotes/utils/email_lib/smtp.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webnotes/utils/email_lib/smtp.py b/webnotes/utils/email_lib/smtp.py index 022a2adde0..b0bcc67d98 100644 --- a/webnotes/utils/email_lib/smtp.py +++ b/webnotes/utils/email_lib/smtp.py @@ -235,10 +235,16 @@ class EMail: webnotes.msgprint("Emails are muted") return + import smtplib try: - SMTPServer().sess.sendmail(self.sender, self.recipients + (self.cc or []), + smtpserver = SMTPServer() + if getattr(smtpserver, "always_use_login_id_as_sender"): + self.sender = smtpserver.login + + smtpserver.sess.sendmail(self.sender, self.recipients + (self.cc or []), self.as_string()) + except smtplib.SMTPSenderRefused, e: webnotes.msgprint("""Invalid Outgoing Mail Server's Login Id or Password. \ Please rectify and try again.""", @@ -265,6 +271,7 @@ class SMTPServer: self.use_ssl = cint(es.use_ssl) self.login = es.mail_login self.password = es.mail_password + self.always_use_login_id_as_sender = es.always_use_login_id_as_sender else: self.server = getattr(conf, "mail_server", "") self.port = getattr(conf, "mail_port", None)