diff options
| author | mga@tinyerp.com <> | 2008-08-20 16:48:04 +0530 |
|---|---|---|
| committer | mga@tinyerp.com <> | 2008-08-20 16:48:04 +0530 |
| commit | 7764a2e4a85c13e75aa3b2ea257c7bb5f6671d24 (patch) | |
| tree | 938a0cfa73f977afa4ce64d8db56a05fc260919c /bin/tools/misc.py | |
| parent | 21d60c388980a3f3182af0ce515b323524f6e393 (diff) | |
Make the same changes in to the email_send like email_send_attach
Make email send debug to False in Server Action
bzr revid: mga@tinyerp.com-20080820111804-qcrvx2n3o94yhq4u
Diffstat (limited to 'bin/tools/misc.py')
| -rw-r--r-- | bin/tools/misc.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bin/tools/misc.py b/bin/tools/misc.py index 4447fed5b01..e02785efa18 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -338,7 +338,15 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non msg['Message-Id'] = '<'+str(time.time())+'-tinycrm-'+str(tinycrm)+'@'+socket.gethostname()+'>' try: s = smtplib.SMTP() - s.connect(config['smtp_server']) + + if debug: + s.debuglevel = 5 + if ssl: + s.ehlo() + s.starttls() + s.ehlo() + + s.connect(config['smtp_server'], config['smtp_port']) if config['smtp_user'] or config['smtp_password']: s.login(config['smtp_user'], config['smtp_password']) s.sendmail(email_from, flatten([email_to, email_cc, email_bcc]), msg.as_string()) |