From a3c6bf9016f07a3b313cc0713f045ee81b59cabb Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 18 Mar 2011 18:52:52 +0530
Subject: [PATCH 01/10] [ADD] ir_mail_server.py: created class for mail server
 ir_mail_server

bzr revid: rha@tinyerp.com-20110318132252-w0c8vi4svhwjntem
---
 openerp/addons/base/ir/ir_mail_server.py | 134 +++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 openerp/addons/base/ir/ir_mail_server.py

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
new file mode 100644
index 00000000000..f1d80f6afc6
--- /dev/null
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+import tools
+
+#import time
+#import binascii
+#import email
+#from email.header import decode_header
+#from email.utils import parsedate
+#import base64
+#import re
+#import logging
+#import xmlrpclib
+
+#_logger = logging.getLogger('mailgate')
+
+#import re
+import smtplib
+#import base64
+#from email import Encoders
+#from email.mime.base import MIMEBase
+#from email.mime.multipart import MIMEMultipart
+#from email.mime.text import MIMEText
+#from email.header import decode_header, Header
+#from email.utils import formatdate
+#import netsvc
+#import datetime
+#import tools
+#import logging
+
+#EMAIL_PATTERN = re.compile(r'([^()\[\] ,<:\\>@";]+@[^()\[\] ,<:\\>@";]+)') # See RFC822
+
+class ir_mail_server(osv.osv):
+    """
+    mail server
+    """
+    _name = "ir.mail.server"
+
+    _columns = {
+        'name': fields.char('Name',
+                        size=64, required=True,
+                        select=True,
+                        help="The Name is used as the Sender name along with the provided From Email, \
+unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
+                        ),
+         'email_id': fields.char('From Email',
+                        size=120, required=True,
+                        help="eg: 'john@doe.com' or 'John Doe <john@doe.com>'"),
+        'smtp_host': fields.char('Server',
+                        size=120, required=True,
+                        help="Enter name of outgoing server, eg: smtp.yourdomain.com"),
+        'smtp_port': fields.integer('SMTP Port',
+                        size=64, required=True,
+                        help="Enter port number, eg: 25 or 587"),
+        'smtp_user': fields.char('User Name',
+                        size=120, required=False,
+                        help="Specify the username if your SMTP server requires authentication, "
+                        "otherwise leave it empty."),
+        'smtp_pass': fields.char('Password',
+                        size=120,
+                        required=False),
+        'smtp_tls':fields.boolean('TLS'),
+        'smtp_ssl':fields.boolean('SSL/TLS'),
+        'priority': fields.integer('Priority', help=""),
+    }
+
+    _defaults = {
+         'name':lambda self, cursor, user, context:self.pool.get( 'res.users'
+                                                ).read(cursor, user, user, ['name'], context)['name'],
+         'smtp_port': tools.config.get('smtp_port',25),
+         'smtp_host': tools.config.get('smtp_server','localhost'),
+         'smtp_ssl': tools.config.get('smtp_ssl',False),
+         'smtp_tls': True,
+         'priority': 10,
+     }
+
+    _sql_constraints = [
+        (
+         'email_uniq',
+         'unique (email_id)',
+         'Another setting already exists with this email ID !')
+    ]
+
+
+    def name_get(self, cr, uid, ids, context=None):
+        return [(a["id"], "%s (%s)" % (a['email_id'], a['name'])) for a in self.read(cr, uid, ids, ['name', 'email_id'], context=context)]
+
+    def test_smtp_connection(self, cr, uid, ids, context=None):
+        """
+        Test SMTP connection works
+        """
+        try:
+            for smtp_server in self.browse(cr, uid, ids, context=context):
+                smtp = tools.connect_smtp_server(smtp_server.smtpserver, smtp_server.smtpport,  user_name=smtp_server.smtpuname,
+                                user_password=smtp_server.smtppass, ssl=smtp_server.smtpssl, tls=smtp_server.smtptls)
+                try:
+                    smtp.quit()
+                except Exception:
+                    # ignored, just a consequence of the previous exception
+                    pass
+        except Exception, error:
+            raise osv.except_osv(
+                                 _("SMTP Connection: Test failed"),
+                                 _("Reason: %s") % error
+                                 )
+
+        raise osv.except_osv(_("SMTP Connection: Test Successfully!"), '')
+
+
+ir_mail_server()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 75e5720f4e62340af8cf920b0e9a3787b867e455 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 21 Mar 2011 18:42:09 +0530
Subject: [PATCH 02/10] [IMP] ir.xml: created view for ir_mail_server and added
 menu

bzr revid: rha@tinyerp.com-20110321131209-jqwa3mop83nuy7av
---
 openerp/addons/base/ir/__init__.py       |  5 +-
 openerp/addons/base/ir/ir.xml            | 72 ++++++++++++++++++++++++
 openerp/addons/base/ir/ir_mail_server.py | 41 ++------------
 3 files changed, 79 insertions(+), 39 deletions(-)

diff --git a/openerp/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py
index 9b4eb96df5f..4a6bd3c614c 100644
--- a/openerp/addons/base/ir/__init__.py
+++ b/openerp/addons/base/ir/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,6 +36,7 @@ import ir_rule
 import wizard
 import ir_config_parameter
 import osv_memory_autovacuum
+import ir_mail_server
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index a7e9922331b..06f76de232e 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1942,5 +1942,77 @@
             <field name="args">()</field>
         </record>
 
+        <!-- ir.mail.server -->
+
+        <record model="ir.ui.view" id="ir_mail_server_form">
+            <field name="name">ir.mail.server.form</field>
+            <field name="model">ir.mail.server</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Smtp Server Configuration">
+                    <group colspan="4">
+                        <field name="name"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Configuration">
+                            <separator string="Server Information" colspan="4"/>
+                            <group colspan="4" col="8">
+                                <field name="smtp_host"/>
+                                <field name="smtp_port"/>
+                                <field name="smtp_ssl"/>
+                                <field name="smtp_tls"/>
+                             </group>
+
+                            <separator string="User Information" colspan="4"/>
+                            <group col="6" colspan="4">
+                                <field name="smtp_user"/>
+                                <field name="smtp_pass" password="True"/>
+
+                            </group>
+                            <separator string="" colspan="4"/>
+                            <label string="" colspan="2"/>
+                            <button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network" colspan="2"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="ir_mail_server_tree">
+            <field name="name">ir.mail.server.tree</field>
+            <field name="model">ir.mail.server</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="SMTP Server">
+                    <field name="name"/>
+                    <field name="smtp_host"/>
+                    <button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_ir_mail_server_search" model="ir.ui.view">
+            <field name="name">ir.mail.server.search</field>
+            <field name="model">ir.mail.server</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Smtp Server">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_ir_mail_server_tree_all">
+            <field name="name">Email Accounts</field>
+            <field name="res_model">ir.mail.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="ir_mail_server_tree" />
+            <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_my': 1}</field>
+            <field name="search_view_id" ref="view_ir_mail_server_search"/>
+        </record>
+
+        <menuitem name="Email Accounts" id="menu_email_smtp_server_all" parent="base.menu_config" action="action_ir_mail_server_tree_all" sequence="15"/>
+
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index f1d80f6afc6..05bca603742 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -24,33 +24,8 @@ from osv import fields
 from tools.translate import _
 import tools
 
-#import time
-#import binascii
-#import email
-#from email.header import decode_header
-#from email.utils import parsedate
-#import base64
-#import re
-#import logging
-#import xmlrpclib
-
-#_logger = logging.getLogger('mailgate')
-
-#import re
 import smtplib
-#import base64
-#from email import Encoders
-#from email.mime.base import MIMEBase
-#from email.mime.multipart import MIMEMultipart
-#from email.mime.text import MIMEText
-#from email.header import decode_header, Header
-#from email.utils import formatdate
-#import netsvc
-#import datetime
-#import tools
-#import logging
-
-#EMAIL_PATTERN = re.compile(r'([^()\[\] ,<:\\>@";]+@[^()\[\] ,<:\\>@";]+)') # See RFC822
+import netsvc
 
 class ir_mail_server(osv.osv):
     """
@@ -65,9 +40,6 @@ class ir_mail_server(osv.osv):
                         help="The Name is used as the Sender name along with the provided From Email, \
 unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
                         ),
-         'email_id': fields.char('From Email',
-                        size=120, required=True,
-                        help="eg: 'john@doe.com' or 'John Doe <john@doe.com>'"),
         'smtp_host': fields.char('Server',
                         size=120, required=True,
                         help="Enter name of outgoing server, eg: smtp.yourdomain.com"),
@@ -97,15 +69,11 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
      }
 
     _sql_constraints = [
-        (
-         'email_uniq',
-         'unique (email_id)',
-         'Another setting already exists with this email ID !')
     ]
 
 
     def name_get(self, cr, uid, ids, context=None):
-        return [(a["id"], "%s (%s)" % (a['email_id'], a['name'])) for a in self.read(cr, uid, ids, ['name', 'email_id'], context=context)]
+        return [(a["id"], "(%s)" % (a['name'])) for a in self.read(cr, uid, ids, ['name'], context=context)]
 
     def test_smtp_connection(self, cr, uid, ids, context=None):
         """
@@ -113,8 +81,8 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         """
         try:
             for smtp_server in self.browse(cr, uid, ids, context=context):
-                smtp = tools.connect_smtp_server(smtp_server.smtpserver, smtp_server.smtpport,  user_name=smtp_server.smtpuname,
-                                user_password=smtp_server.smtppass, ssl=smtp_server.smtpssl, tls=smtp_server.smtptls)
+                smtp = tools.connect_smtp_server(smtp_server.smtp_host, smtp_server.smtp_port,  user_name=smtp_server.smtp_user,
+                                user_password=smtp_server.smtp_pass, ssl=smtp_server.smtp_ssl, tls=smtp_server.smtp_tls)
                 try:
                     smtp.quit()
                 except Exception:
@@ -128,7 +96,6 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
 
         raise osv.except_osv(_("SMTP Connection: Test Successfully!"), '')
 
-
 ir_mail_server()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 6c699c5082b9937187865590e7beed41a09f09eb Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 22 Mar 2011 19:05:55 +0530
Subject: [PATCH 03/10] [IMP] ir_mail_server.py: created method email_send and
 did other changes

bzr revid: rha@tinyerp.com-20110322133555-dshlx0em3n3y7el3
---
 openerp/addons/base/ir/ir.xml            |   8 +-
 openerp/addons/base/ir/ir_mail_server.py | 183 ++++++++++++++++++++++-
 2 files changed, 183 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 06f76de232e..559465ffdb8 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1946,7 +1946,7 @@
 
         <record model="ir.ui.view" id="ir_mail_server_form">
             <field name="name">ir.mail.server.form</field>
-            <field name="model">ir.mail.server</field>
+            <field name="model">ir.mail_server</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Smtp Server Configuration">
@@ -1980,7 +1980,7 @@
 
         <record model="ir.ui.view" id="ir_mail_server_tree">
             <field name="name">ir.mail.server.tree</field>
-            <field name="model">ir.mail.server</field>
+            <field name="model">ir.mail_server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="SMTP Server">
@@ -1993,7 +1993,7 @@
 
         <record id="view_ir_mail_server_search" model="ir.ui.view">
             <field name="name">ir.mail.server.search</field>
-            <field name="model">ir.mail.server</field>
+            <field name="model">ir.mail_server</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Smtp Server">
@@ -2004,7 +2004,7 @@
 
         <record model="ir.actions.act_window" id="action_ir_mail_server_tree_all">
             <field name="name">Email Accounts</field>
-            <field name="res_model">ir.mail.server</field>
+            <field name="res_model">ir.mail_server</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="ir_mail_server_tree" />
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 05bca603742..b722559d961 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -23,15 +23,62 @@ from osv import osv
 from osv import fields
 from tools.translate import _
 import tools
-
-import smtplib
+from tools import ustr
+from tools import config
 import netsvc
 
+import inspect
+import subprocess
+import logging
+import os
+import re
+import smtplib
+import socket
+import sys
+import threading
+import time
+import warnings
+import zipfile
+from datetime import datetime
+from email.MIMEText import MIMEText
+from email.MIMEBase import MIMEBase
+from email.MIMEMultipart import MIMEMultipart
+from email.Header import Header
+from email.Utils import formatdate, COMMASPACE
+from email import Utils
+from email import Encoders
+from itertools import islice, izip
+from lxml import etree
+if sys.version_info[:2] < (2, 4):
+    from threadinglocal import local
+else:
+    from threading import local
+try:
+    from html2text import html2text
+except ImportError:
+    html2text = None
+
+import openerp.loglevels as loglevels
+from tools import config
+from email.generator import Generator
+
+
+# get_encodings, ustr and exception_to_unicode were originally from tools.misc.
+# There are moved to loglevels until we refactor tools.
+from openerp.loglevels import get_encodings, ustr, exception_to_unicode
+
+_logger = logging.getLogger('tools')
+
+# List of etree._Element subclasses that we choose to ignore when parsing XML.
+# We include the *Base ones just in case, currently they seem to be subclasses of the _* ones.
+SKIPPED_ELEMENT_TYPES = (etree._Comment, etree._ProcessingInstruction, etree.CommentBase, etree.PIBase)
+
+
 class ir_mail_server(osv.osv):
     """
     mail server
     """
-    _name = "ir.mail.server"
+    _name = "ir.mail_server"
 
     _columns = {
         'name': fields.char('Name',
@@ -81,7 +128,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         """
         try:
             for smtp_server in self.browse(cr, uid, ids, context=context):
-                smtp = tools.connect_smtp_server(smtp_server.smtp_host, smtp_server.smtp_port,  user_name=smtp_server.smtp_user,
+                smtp = self.connect_smtp_server(smtp_server.smtp_host, smtp_server.smtp_port,  user_name=smtp_server.smtp_user,
                                 user_password=smtp_server.smtp_pass, ssl=smtp_server.smtp_ssl, tls=smtp_server.smtp_tls)
                 try:
                     smtp.quit()
@@ -96,6 +143,134 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
 
         raise osv.except_osv(_("SMTP Connection: Test Successfully!"), '')
 
+    def connect_smtp_server(server_host, server_port,  user_name=None, user_password=None, ssl=False, tls=False, debug=False):
+        """
+        Connect SMTP Server and returned the (SMTP) object
+        """
+        smtp_server = None
+        try:
+            if ssl:
+                # In Python 2.6
+                smtp_server = smtplib.SMTP_SSL(server_host, server_port)
+            else:
+                smtp_server = smtplib.SMTP(server_host, server_port)
+
+            smtp_server.set_debuglevel(int(bool(debug)))  # 0 or 1
+
+
+            if tls:
+                smtp_server.ehlo()
+                smtp_server.starttls()
+                smtp_server.ehlo()
+
+            #smtp_server.connect(server_host, server_port)
+
+            if smtp_server.has_extn('AUTH') or user_name or user_password:
+                smtp_server.login(user_name, user_password)
+
+
+        except Exception, error:
+            _logger.error('Could not connect to smtp server : %s' %(error), exc_info=True)
+            raise error
+        return smtp_server
+
+    def _email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False,
+                smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
+        """Low-level method to send directly a Message through the configured smtp server.
+            :param smtp_from: RFC-822 envelope FROM (not displayed to recipient)
+            :param smtp_to_list: RFC-822 envelope RCPT_TOs (not displayed to recipient)
+            :param message: an email.message.Message to send
+            :param debug: True if messages should be output to stderr before being sent,
+                          and smtplib.SMTP put into debug mode.
+            :return: True if the mail was delivered successfully to the smtp,
+                     else False (+ exception logged)
+        """
+        print '_email::'
+        class WriteToLogger(object):
+            def __init__(self):
+                self.logger = loglevels.Logger()
+
+            def write(self, s):
+                self.logger.notifyChannel('email_send', loglevels.LOG_DEBUG, s)
+
+        try:
+            smtp_server = smtp_server or config['smtp_server']
+
+            if smtp_server.startswith('maildir:/'):
+                from mailbox import Maildir
+                maildir_path = smtp_server[8:]
+                mdir = Maildir(maildir_path,factory=None, create = True)
+                mdir.add(message.as_string(True))
+                return True
+
+            if debug:
+                oldstderr = smtplib.stderr
+                smtplib.stderr = WriteToLogger()
+
+            if not ssl: ssl = config.get('smtp_ssl', False)
+            smtp = self.connect_smtp_server(smtp_server, smtp_port, smtp_user, smtp_password, ssl=ssl, tls=True, debug=debug)
+            try:
+                smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
+            except Exception:
+                _logger.error('could not deliver Email(s)', exc_info=True)
+                return False
+            finally:
+                try:
+                    smtp.quit()
+                except Exception:
+                    # ignored, just a consequence of the previous exception
+                    pass
+
+            if debug:
+                smtplib.stderr = oldstderr
+        except Exception:
+            _logger.error('Error on Send Emails Services', exc_info=True)
+            return False
+
+        return True
+
+    def send_email(self, cr, uid, smtp_from, smtp_to_list, message, id=None, subject=None, ssl=False,
+                    debug=False, smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
+
+        """Send an email.
+        """
+
+        if not (smtp_from or config['email_from']):
+            raise ValueError("Sending an email requires either providing a sender "
+                             "address or having configured one")
+        if not smtp_from: smtp_from = config.get('email_from', False)
+
+        smtp_from = ustr(smtp_from).encode('utf-8')
+
+        email_body = ustr(message).encode('utf-8')
+        email_text = MIMEText(email_body or '',_charset='utf-8')
+        msg = MIMEMultipart()
+
+#        if not message_id and openobject_id:
+#            message_id = generate_tracking_message_id(openobject_id)
+#        else:
+        message_id = Utils.make_msgid()
+        msg['Message-Id'] = message_id
+        if subject:
+            msg['Subject'] = Header(ustr(subject), 'utf-8')
+        msg['From'] = smtp_from
+        msg['To'] = COMMASPACE.join(smtp_to_list)
+        msg['Date'] = formatdate(localtime=True)
+
+        if html2text and subtype == 'html':
+            text = html2text(email_body.decode('utf-8')).encode('utf-8')
+            alternative_part = MIMEMultipart(_subtype="alternative")
+            alternative_part.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
+            alternative_part.attach(email_text)
+            msg.attach(alternative_part)
+        else:
+            msg.attach(email_text)
+        res = self._email_send(smtp_from, smtp_to_list, msg)
+        if res:
+            return message_id
+        return False
+
+
 ir_mail_server()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From b0d6ac39151dd5c13bd4254e35f4de95604f108d Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 23 Mar 2011 18:36:01 +0530
Subject: [PATCH 04/10] [IMP] : improvement in send_email

bzr revid: rha@tinyerp.com-20110323130601-hryhc1fh8dakr2o7
---
 openerp/addons/base/ir/ir.xml            |   2 +
 openerp/addons/base/ir/ir_mail_server.py |  28 ++--
 openerp/tools/misc.py                    | 180 ++---------------------
 3 files changed, 36 insertions(+), 174 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 559465ffdb8..d5a3b35807d 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1961,6 +1961,7 @@
                                 <field name="smtp_port"/>
                                 <field name="smtp_ssl"/>
                                 <field name="smtp_tls"/>
+                                <field name="priority"/>
                              </group>
 
                             <separator string="User Information" colspan="4"/>
@@ -1986,6 +1987,7 @@
                 <tree string="SMTP Server">
                     <field name="name"/>
                     <field name="smtp_host"/>
+                    <field name="priority"/>
                     <button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network"/>
                 </tree>
             </field>
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index b722559d961..c138d315004 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -128,8 +128,8 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         """
         try:
             for smtp_server in self.browse(cr, uid, ids, context=context):
-                smtp = self.connect_smtp_server(smtp_server.smtp_host, smtp_server.smtp_port,  user_name=smtp_server.smtp_user,
-                                user_password=smtp_server.smtp_pass, ssl=smtp_server.smtp_ssl, tls=smtp_server.smtp_tls)
+                smtp = self.connect_smtp_server(cr, uid, smtp_server.smtp_host, smtp_server.smtp_port, user_name=smtp_server.smtp_user,
+                                user_password=smtp_server.smtp_pass, ssl=smtp_server.smtp_ssl, tls=smtp_server.smtp_tls, debug=False)
                 try:
                     smtp.quit()
                 except Exception:
@@ -143,7 +143,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
 
         raise osv.except_osv(_("SMTP Connection: Test Successfully!"), '')
 
-    def connect_smtp_server(server_host, server_port,  user_name=None, user_password=None, ssl=False, tls=False, debug=False):
+    def connect_smtp_server(self, cr, uid, server_host, server_port, user_name=None, user_password=None, ssl=False, tls=False, debug=False):
         """
         Connect SMTP Server and returned the (SMTP) object
         """
@@ -174,7 +174,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             raise error
         return smtp_server
 
-    def _email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False,
+    def _email_send(self, cr, uid, smtp_from, smtp_to_list, message, ssl=False, debug=False,
                 smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
         """Low-level method to send directly a Message through the configured smtp server.
             :param smtp_from: RFC-822 envelope FROM (not displayed to recipient)
@@ -185,7 +185,6 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             :return: True if the mail was delivered successfully to the smtp,
                      else False (+ exception logged)
         """
-        print '_email::'
         class WriteToLogger(object):
             def __init__(self):
                 self.logger = loglevels.Logger()
@@ -207,8 +206,10 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
                 oldstderr = smtplib.stderr
                 smtplib.stderr = WriteToLogger()
 
-            if not ssl: ssl = config.get('smtp_ssl', False)
-            smtp = self.connect_smtp_server(smtp_server, smtp_port, smtp_user, smtp_password, ssl=ssl, tls=True, debug=debug)
+            if not ssl:
+                ssl = config.get('smtp_ssl', False)
+
+            smtp = self.connect_smtp_server(cr, uid, smtp_server, smtp_port, user_name=smtp_user, user_password=smtp_password, ssl=ssl, tls=True, debug=debug)
             try:
                 smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
             except Exception:
@@ -239,9 +240,16 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             raise ValueError("Sending an email requires either providing a sender "
                              "address or having configured one")
         if not smtp_from: smtp_from = config.get('email_from', False)
-
         smtp_from = ustr(smtp_from).encode('utf-8')
 
+        if id:
+            smtp_server = self.browse(cr, uid, id)
+
+        if not (id and smtp_server):
+            server = self.search(cr, uid, [], order='priority', limit=1)
+            smtp_server = self.browse(cr, uid, server[0])
+
+        if not message: message = u''
         email_body = ustr(message).encode('utf-8')
         email_text = MIMEText(email_body or '',_charset='utf-8')
         msg = MIMEMultipart()
@@ -265,7 +273,9 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             msg.attach(alternative_part)
         else:
             msg.attach(email_text)
-        res = self._email_send(smtp_from, smtp_to_list, msg)
+
+        res = self._email_send(cr, uid, smtp_from, smtp_to_list, msg, smtp_server=smtp_server.smtp_host,
+                               smtp_user=smtp_server.smtp_user, smtp_password=smtp_server.smtp_pass, smtp_port=smtp_server.smtp_port)
         if res:
             return message_id
         return False
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 39fa0bd5932..856dbe8d462 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -59,6 +59,7 @@ except ImportError:
 import openerp.loglevels as loglevels
 from config import config
 from lru import LRU
+import openerp.pooler as pooler
 
 # get_encodings, ustr and exception_to_unicode were originally from tools.misc.
 # There are moved to loglevels until we refactor tools.
@@ -427,176 +428,25 @@ def generate_tracking_message_id(openobject_id):
     """
     return "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
 
-def connect_smtp_server(server_host, server_port,  user_name=None, user_password=None, ssl=False, tls=False, debug=False):
-    """
-    Connect SMTP Server and returned the (SMTP) object
-    """
-    smtp_server = None
+def email_send(smtp_from, smtp_to_list, subject, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
+           smtp_user=None, smtp_password=None, cr=None):
     try:
-        if ssl:
-            # In Python 2.6
-            smtp_server = smtplib.SMTP_SSL(server_host, server_port)
-        else:
-            smtp_server = smtplib.SMTP(server_host, server_port)
-
-        smtp_server.set_debuglevel(int(bool(debug)))  # 0 or 1
-
-
-        if tls:
-            smtp_server.ehlo()
-            smtp_server.starttls()
-            smtp_server.ehlo()
-
-        #smtp_server.connect(server_host, server_port)
-
-        if smtp_server.has_extn('AUTH') or user_name or user_password:
-            smtp_server.login(user_name, user_password)
-
-
-    except Exception, error:
-        _logger.error('Could not connect to smtp server : %s' %(error), exc_info=True)
-        raise error
-    return smtp_server
-
-
-def _email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False,
-            smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
-    """Low-level method to send directly a Message through the configured smtp server.
-        :param smtp_from: RFC-822 envelope FROM (not displayed to recipient)
-        :param smtp_to_list: RFC-822 envelope RCPT_TOs (not displayed to recipient)
-        :param message: an email.message.Message to send
-        :param debug: True if messages should be output to stderr before being sent,
-                      and smtplib.SMTP put into debug mode.
-        :return: True if the mail was delivered successfully to the smtp,
-                 else False (+ exception logged)
-    """
-    class WriteToLogger(object):
-        def __init__(self):
-            self.logger = loglevels.Logger()
-
-        def write(self, s):
-            self.logger.notifyChannel('email_send', loglevels.LOG_DEBUG, s)
-
-    try:
-        smtp_server = smtp_server or config['smtp_server']
-
-        if smtp_server.startswith('maildir:/'):
-            from mailbox import Maildir
-            maildir_path = smtp_server[8:]
-            mdir = Maildir(maildir_path,factory=None, create = True)
-            mdir.add(message.as_string(True))
-            return True
-
-        if debug:
-            oldstderr = smtplib.stderr
-            smtplib.stderr = WriteToLogger()
-
-        if not ssl: ssl = config.get('smtp_ssl', False)
-        smtp = connect_smtp_server(smtp_server, smtp_port, smtp_user, smtp_password, ssl=ssl, tls=True, debug=debug)
-        try:
-            smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
-        except Exception:
-            _logger.error('could not deliver Email(s)', exc_info=True)
-            return False
-        finally:
-            try:
-                smtp.quit()
-            except Exception:
-                # ignored, just a consequence of the previous exception
-                pass
-
-        if debug:
-            smtplib.stderr = oldstderr
+        if not cr:
+            db_name = getattr(threading.currentThread(), 'dbname', None)
+            if db_name:
+                cr = pooler.get_db_only(dbname).cursor()
+                server_pool = pooler.get_pool(cr.dbname).get('ir.mail_server')
+                server_pool.send_email(cr, uid, smtp_from, smtp_to_list, message,
+                    ssl=ssl,debug=debug, smtp_server=smtp_server, smtp_port=smtp_port,
+                    smtp_user=smtp_user, smtp_password=smtp_password)
+            else:
+                raise Exception("No database cursor found!")
     except Exception:
-        _logger.error('Error on Send Emails Services', exc_info=True)
         return False
-
+    finally:
+        if cr: cr.close()
     return True
 
-
-def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
-               attach=None, message_id=None, references=None, openobject_id=False, debug=False, subtype='plain', x_headers=None, priority='3',
-               smtp_server=None, smtp_port=None, ssl=False, smtp_user=None, smtp_password=None):
-
-    """Send an email.
-
-    Arguments:
-
-    `email_from`: A string used to fill the `From` header, if falsy,
-                  config['email_from'] is used instead.  Also used for
-                  the `Reply-To` header if `reply_to` is not provided
-
-    `email_to`: a sequence of addresses to send the mail to.
-    """
-    if x_headers is None:
-        x_headers = {}
-
-
-    if not (email_from or config['email_from']):
-        raise ValueError("Sending an email requires either providing a sender "
-                         "address or having configured one")
-
-    if not email_from: email_from = config.get('email_from', False)
-    email_from = ustr(email_from).encode('utf-8')
-
-    if not email_cc: email_cc = []
-    if not email_bcc: email_bcc = []
-    if not body: body = u''
-
-    email_body = ustr(body).encode('utf-8')
-    email_text = MIMEText(email_body or '',_subtype=subtype,_charset='utf-8')
-    msg = MIMEMultipart()
-
-    if not message_id and openobject_id:
-        message_id = generate_tracking_message_id(openobject_id)
-    else:
-        message_id = Utils.make_msgid()
-    if references:
-        msg['references'] = references
-    msg['Message-Id'] = message_id
-    msg['Subject'] = Header(ustr(subject), 'utf-8')
-    msg['From'] = email_from
-    del msg['Reply-To']
-    if reply_to:
-        msg['Reply-To'] = reply_to
-    else:
-        msg['Reply-To'] = msg['From']
-    msg['To'] = COMMASPACE.join(email_to)
-    if email_cc:
-        msg['Cc'] = COMMASPACE.join(email_cc)
-    if email_bcc:
-        msg['Bcc'] = COMMASPACE.join(email_bcc)
-    msg['Date'] = formatdate(localtime=True)
-
-    msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
-
-    # Add dynamic X Header
-    for key, value in x_headers.iteritems():
-        msg['%s' % key] = str(value)
-
-    if html2text and subtype == 'html':
-        text = html2text(email_body.decode('utf-8')).encode('utf-8')
-        alternative_part = MIMEMultipart(_subtype="alternative")
-        alternative_part.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
-        alternative_part.attach(email_text)
-        msg.attach(alternative_part)
-    else:
-        msg.attach(email_text)
-
-    if attach:
-        for (fname,fcontent) in attach:
-            part = MIMEBase('application', "octet-stream")
-            part.set_payload( fcontent )
-            Encoders.encode_base64(part)
-            part.add_header('Content-Disposition', 'attachment; filename="%s"' % (fname,))
-            msg.attach(part)
-
-    res = _email_send(email_from, flatten([email_to, email_cc, email_bcc]), msg, ssl=ssl, debug=debug,
-                       smtp_server=smtp_server, smtp_port=smtp_port, smtp_user=smtp_user, smtp_password=smtp_password)
-    if res:
-        return message_id
-    return False
-
 #----------------------------------------------------------
 # SMS
 #----------------------------------------------------------

From 2bf882fbf70022ca142f708396323ef49f1c03db Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 25 Mar 2011 09:35:37 +0530
Subject: [PATCH 05/10] [IMP] misc.py: improvment in email_send method and
 added data record for ir_mail_server

bzr revid: rha@tinyerp.com-20110325040537-sp96w9i3gceu6yfn
---
 openerp/addons/base/base_data.xml |  8 +++++++-
 openerp/tools/misc.py             | 25 +++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 367050a13cb..fea9df5ad54 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1603,7 +1603,13 @@
            <field name="rate">691.3153</field>
            <field name="currency_id" ref="CRC"/>
            <field eval="time.strftime('%Y-01-01')" name="name"/>
-       </record>
+        </record>
 
+        <record id="ir_mail_server_localhost0" model="ir.mail_server">
+            <field name="name">localhost</field>
+            <field name="smtp_host">localhost</field>
+            <field eval="25" name="smtp_port"/>
+            <field eval="10" name="priority"/>
+	</record>
     </data>
 </openerp>
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 856dbe8d462..3a6d0afd1cd 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -428,23 +428,24 @@ def generate_tracking_message_id(openobject_id):
     """
     return "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
 
-def email_send(smtp_from, smtp_to_list, subject, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
+def email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
            smtp_user=None, smtp_password=None, cr=None):
+    print 'email tool:'
+    if not cr:
+        db_name = getattr(threading.currentThread(), 'dbname', None)
+        if db_name:
+            cr = pooler.get_db_only(dbname).cursor()
+        else:
+            raise Exception("No database cursor found!")
     try:
-        if not cr:
-            db_name = getattr(threading.currentThread(), 'dbname', None)
-            if db_name:
-                cr = pooler.get_db_only(dbname).cursor()
-                server_pool = pooler.get_pool(cr.dbname).get('ir.mail_server')
-                server_pool.send_email(cr, uid, smtp_from, smtp_to_list, message,
-                    ssl=ssl,debug=debug, smtp_server=smtp_server, smtp_port=smtp_port,
-                    smtp_user=smtp_user, smtp_password=smtp_password)
-            else:
-                raise Exception("No database cursor found!")
+        server_pool = pooler.get_pool(cr.dbname).get('ir.mail_server')
+        server_pool.send_email(cr, uid, smtp_from, smtp_to_list, message,
+            ssl=ssl,debug=debug, smtp_server=smtp_server, smtp_port=smtp_port,
+            smtp_user=smtp_user, smtp_password=smtp_password)
     except Exception:
         return False
     finally:
-        if cr: cr.close()
+        cr.close()
     return True
 
 #----------------------------------------------------------

From 6a76b19d2efeae6fe954b0094cdfaef18eb3433d Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 25 Mar 2011 17:27:02 +0530
Subject: [PATCH 06/10] [IMP] ir_mail_server.py: implemented onchange for tls
 and ssl boolean field

bzr revid: rha@tinyerp.com-20110325115702-6066ifi582eztgfq
---
 openerp/addons/base/ir/ir.xml            |  4 ++--
 openerp/addons/base/ir/ir_mail_server.py | 22 ++++++++++++++--------
 openerp/tools/misc.py                    |  3 +--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index d5a3b35807d..0c9a3ec5ae8 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1959,8 +1959,8 @@
                             <group colspan="4" col="8">
                                 <field name="smtp_host"/>
                                 <field name="smtp_port"/>
-                                <field name="smtp_ssl"/>
-                                <field name="smtp_tls"/>
+                                <field name="smtp_ssl" on_change="on_change_ssl(smtp_ssl)"/>
+                                <field name="smtp_tls" on_change="on_change_tls(smtp_tls)"/>
                                 <field name="priority"/>
                              </group>
 
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index c138d315004..bc0b449cf8a 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -102,16 +102,11 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
                         required=False),
         'smtp_tls':fields.boolean('TLS'),
         'smtp_ssl':fields.boolean('SSL/TLS'),
-        'priority': fields.integer('Priority', help=""),
+        'priority': fields.integer('Priority', help="If no specific server is requested for a mail then the highest priority one is used"),
     }
 
     _defaults = {
-         'name':lambda self, cursor, user, context:self.pool.get( 'res.users'
-                                                ).read(cursor, user, user, ['name'], context)['name'],
-         'smtp_port': tools.config.get('smtp_port',25),
-         'smtp_host': tools.config.get('smtp_server','localhost'),
-         'smtp_ssl': tools.config.get('smtp_ssl',False),
-         'smtp_tls': True,
+         'smtp_port': 25,
          'priority': 10,
      }
 
@@ -244,7 +239,6 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
 
         if id:
             smtp_server = self.browse(cr, uid, id)
-
         if not (id and smtp_server):
             server = self.search(cr, uid, [], order='priority', limit=1)
             smtp_server = self.browse(cr, uid, server[0])
@@ -280,6 +274,18 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             return message_id
         return False
 
+    def on_change_ssl(self, cr, uid, ids, smtp_ssl):
+        smtp_port = 0
+        if smtp_ssl:
+            smtp_port = 465
+        return {'value':{'smtp_ssl':smtp_ssl,'smtp_tls':False,'smtp_port':smtp_port}}
+
+    def on_change_tls(self, cr, uid, ids, smtp_tls):
+        smtp_port = 0
+        if smtp_tls:
+            smtp_port = 0
+        return {'value':{'smtp_tls':smtp_tls,'smtp_ssl':False,'smtp_port':smtp_port}}
+
 
 ir_mail_server()
 
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 3a6d0afd1cd..96c6fe616e1 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -430,11 +430,10 @@ def generate_tracking_message_id(openobject_id):
 
 def email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
            smtp_user=None, smtp_password=None, cr=None):
-    print 'email tool:'
     if not cr:
         db_name = getattr(threading.currentThread(), 'dbname', None)
         if db_name:
-            cr = pooler.get_db_only(dbname).cursor()
+            cr = pooler.get_db_only(db_name).cursor()
         else:
             raise Exception("No database cursor found!")
     try:

From e3c85bedf0693b4815d242bdf44b5447a244c137 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 28 Mar 2011 19:18:50 +0530
Subject: [PATCH 07/10] [IMP] ir_mail_server.py: improvement in send_email
 method

bzr revid: rha@tinyerp.com-20110328134850-x6dyw3zzqz4k8m1w
---
 openerp/addons/base/ir/ir_mail_server.py | 57 ++++++++++++++++++++----
 openerp/tools/misc.py                    |  7 ---
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index bc0b449cf8a..ad408f80c8d 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -27,6 +27,7 @@ from tools import ustr
 from tools import config
 import netsvc
 
+import base64
 import inspect
 import subprocess
 import logging
@@ -225,6 +226,13 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
 
         return True
 
+    def generate_tracking_message_id(self, openobject_id):
+        """Returns a string that can be used in the Message-ID RFC822 header field so we
+           can track the replies related to a given object thanks to the "In-Reply-To" or
+           "References" fields that Mail User Agents will set.
+        """
+        return "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
+
     def send_email(self, cr, uid, smtp_from, smtp_to_list, message, id=None, subject=None, ssl=False,
                     debug=False, smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
 
@@ -242,24 +250,44 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         if not (id and smtp_server):
             server = self.search(cr, uid, [], order='priority', limit=1)
             smtp_server = self.browse(cr, uid, server[0])
+        if not id and smtp_server:
+            smtp_server = smtp_server
 
-        if not message: message = u''
-        email_body = ustr(message).encode('utf-8')
+        email_body = ustr(message.body or '').encode('utf-8')
         email_text = MIMEText(email_body or '',_charset='utf-8')
         msg = MIMEMultipart()
 
-#        if not message_id and openobject_id:
-#            message_id = generate_tracking_message_id(openobject_id)
-#        else:
-        message_id = Utils.make_msgid()
+        openobject_id = message.res_id
+        if not message.message_id and openobject_id:
+            message_id = self.generate_tracking_message_id(openobject_id)
+        else:
+            message_id = Utils.make_msgid()
         msg['Message-Id'] = message_id
+
+        if message.references:
+            msg['references'] = message.references
+
         if subject:
             msg['Subject'] = Header(ustr(subject), 'utf-8')
         msg['From'] = smtp_from
-        msg['To'] = COMMASPACE.join(smtp_to_list)
+        msg['To'] = smtp_to_list
+        del msg['Reply-To']
+        if message.reply_to:
+            msg['Reply-To'] = message.reply_to
+        else:
+            msg['Reply-To'] = msg['From']
+        msg['Cc'] = message.email_cc or []
+        msg['Bcc'] = message.email_bcc or []
+        #msg['X-Priority'] = message.priority
         msg['Date'] = formatdate(localtime=True)
 
-        if html2text and subtype == 'html':
+        # Add dynamic X Header
+        if message.headers:
+            x_headers = message.headers
+            for key, value in x_headers.iteritems():
+                msg['%s' % key] = str(value)
+
+        if html2text and message.sub_type == 'html':
             text = html2text(email_body.decode('utf-8')).encode('utf-8')
             alternative_part = MIMEMultipart(_subtype="alternative")
             alternative_part.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
@@ -268,8 +296,19 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         else:
             msg.attach(email_text)
 
+        attachments = []
+        for attach in message.attachment_ids:
+            attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
+        if attachments:
+            for (fname,fcontent) in attachments:
+                part = MIMEBase('application', "octet-stream")
+                part.set_payload( fcontent )
+                Encoders.encode_base64(part)
+                part.add_header('Content-Disposition', 'attachment; filename="%s"' % (fname,))
+                msg.attach(part)
+
         res = self._email_send(cr, uid, smtp_from, smtp_to_list, msg, smtp_server=smtp_server.smtp_host,
-                               smtp_user=smtp_server.smtp_user, smtp_password=smtp_server.smtp_pass, smtp_port=smtp_server.smtp_port)
+                               smtp_user=smtp_server.smtp_user, smtp_password=smtp_server.smtp_pass, smtp_port=smtp_server.smtp_port, debug=message.debug)
         if res:
             return message_id
         return False
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 96c6fe616e1..41d0689a9e9 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -421,13 +421,6 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
     return html
 
-def generate_tracking_message_id(openobject_id):
-    """Returns a string that can be used in the Message-ID RFC822 header field so we
-       can track the replies related to a given object thanks to the "In-Reply-To" or
-       "References" fields that Mail User Agents will set.
-    """
-    return "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
-
 def email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
            smtp_user=None, smtp_password=None, cr=None):
     if not cr:

From 573431a8bad2a471337b049bb945b97f20f22bd2 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 29 Mar 2011 17:23:09 +0530
Subject: [PATCH 08/10] [IMP] ir_mail_server.py: corrected argument of
 send_method and did related changes and also removed unused imports

bzr revid: rha@tinyerp.com-20110329115309-q7q02pto691a9nxp
---
 openerp/addons/base/ir/ir.xml                 |   2 -
 openerp/addons/base/ir/ir_actions.py          |   7 +-
 openerp/addons/base/ir/ir_mail_server.py      | 140 ++++++++++--------
 openerp/addons/base/res/ir_property_view.xml  |   1 +
 .../res/partner/wizard/partner_wizard_spam.py |  11 +-
 openerp/tools/misc.py                         |  10 +-
 6 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 0c9a3ec5ae8..f3aab3c5bd6 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -2014,7 +2014,5 @@
             <field name="search_view_id" ref="view_ir_mail_server_search"/>
         </record>
 
-        <menuitem name="Email Accounts" id="menu_email_smtp_server_all" parent="base.menu_config" action="action_ir_mail_server_tree_all" sequence="15"/>
-
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 7a07ca40ef8..38904aecb5e 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -162,7 +162,7 @@ class act_window(osv.osv):
 
     def _invalid_model_msg(self, cr, uid, ids, context=None):
         return _('Invalid model name in the action definition.')
-    
+
     _constraints = [
         (_check_model, _invalid_model_msg, ['res_model','src_model'])
     ]
@@ -195,7 +195,7 @@ class act_window(osv.osv):
             if act.search_view_id:
                 search_view_id = act.search_view_id.id
             else:
-                res_view = self.pool.get('ir.ui.view').search(cr, uid, 
+                res_view = self.pool.get('ir.ui.view').search(cr, uid,
                         [('model','=',act.res_model),('type','=','search'),
                         ('inherit_id','=',False)], context=context)
                 if res_view:
@@ -631,7 +631,8 @@ class actions_server(osv.osv):
                 subject = self.merge_message(cr, uid, action.subject, action, context)
                 body = self.merge_message(cr, uid, action.message, action, context)
 
-                if tools.email_send(user, [address], subject, body, debug=False, subtype='html') == True:
+                smtp_server_obj = self.pool.get('ir.mail_server')
+                if smtp_server_obj.send_email(uid, user, [address], subject, body, debug=False, subtype='html', cr=cr) == True:
                     logger.info('Email successfully sent to: %s', address)
                 else:
                     logger.warning('Failed to send email to: %s', address)
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index ad408f80c8d..d9a62f75b76 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -28,19 +28,12 @@ from tools import config
 import netsvc
 
 import base64
-import inspect
 import subprocess
 import logging
-import os
-import re
 import smtplib
 import socket
 import sys
-import threading
 import time
-import warnings
-import zipfile
-from datetime import datetime
 from email.MIMEText import MIMEText
 from email.MIMEBase import MIMEBase
 from email.MIMEMultipart import MIMEMultipart
@@ -48,12 +41,6 @@ from email.Header import Header
 from email.Utils import formatdate, COMMASPACE
 from email import Utils
 from email import Encoders
-from itertools import islice, izip
-from lxml import etree
-if sys.version_info[:2] < (2, 4):
-    from threadinglocal import local
-else:
-    from threading import local
 try:
     from html2text import html2text
 except ImportError:
@@ -63,17 +50,19 @@ import openerp.loglevels as loglevels
 from tools import config
 from email.generator import Generator
 
-
 # get_encodings, ustr and exception_to_unicode were originally from tools.misc.
 # There are moved to loglevels until we refactor tools.
 from openerp.loglevels import get_encodings, ustr, exception_to_unicode
 
 _logger = logging.getLogger('tools')
 
-# List of etree._Element subclasses that we choose to ignore when parsing XML.
-# We include the *Base ones just in case, currently they seem to be subclasses of the _* ones.
-SKIPPED_ELEMENT_TYPES = (etree._Comment, etree._ProcessingInstruction, etree.CommentBase, etree.PIBase)
-
+priorities = {
+        '1': '1 (Highest)',
+        '2': '2 (High)',
+        '3': '3 (Normal)',
+        '4': '4 (Low)',
+        '5': '5 (Lowest)',
+    }
 
 class ir_mail_server(osv.osv):
     """
@@ -103,7 +92,8 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
                         required=False),
         'smtp_tls':fields.boolean('TLS'),
         'smtp_ssl':fields.boolean('SSL/TLS'),
-        'priority': fields.integer('Priority', help="If no specific server is requested for a mail then the highest priority one is used"),
+        'priority': fields.integer('Priority', help="If no specific server is \
+                        requested for a mail then the highest priority one is used"),
     }
 
     _defaults = {
@@ -124,8 +114,10 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         """
         try:
             for smtp_server in self.browse(cr, uid, ids, context=context):
-                smtp = self.connect_smtp_server(cr, uid, smtp_server.smtp_host, smtp_server.smtp_port, user_name=smtp_server.smtp_user,
-                                user_password=smtp_server.smtp_pass, ssl=smtp_server.smtp_ssl, tls=smtp_server.smtp_tls, debug=False)
+                smtp = self.connect_smtp_server(cr, uid, smtp_server.smtp_host,
+                       smtp_server.smtp_port, user_name=smtp_server.smtp_user,
+                       user_password=smtp_server.smtp_pass, ssl=smtp_server.smtp_ssl,
+                       tls=smtp_server.smtp_tls, debug=False)
                 try:
                     smtp.quit()
                 except Exception:
@@ -139,7 +131,8 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
 
         raise osv.except_osv(_("SMTP Connection: Test Successfully!"), '')
 
-    def connect_smtp_server(self, cr, uid, server_host, server_port, user_name=None, user_password=None, ssl=False, tls=False, debug=False):
+    def connect_smtp_server(self, cr, uid, server_host, server_port, user_name=None,
+                        user_password=None, ssl=False, tls=False, debug=False):
         """
         Connect SMTP Server and returned the (SMTP) object
         """
@@ -170,8 +163,8 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             raise error
         return smtp_server
 
-    def _email_send(self, cr, uid, smtp_from, smtp_to_list, message, ssl=False, debug=False,
-                smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
+    def _email_send(self, cr, uid, smtp_from, smtp_to_list, message, ssl=False,
+                debug=False, smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
         """Low-level method to send directly a Message through the configured smtp server.
             :param smtp_from: RFC-822 envelope FROM (not displayed to recipient)
             :param smtp_to_list: RFC-822 envelope RCPT_TOs (not displayed to recipient)
@@ -205,7 +198,8 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             if not ssl:
                 ssl = config.get('smtp_ssl', False)
 
-            smtp = self.connect_smtp_server(cr, uid, smtp_server, smtp_port, user_name=smtp_user, user_password=smtp_password, ssl=ssl, tls=True, debug=debug)
+            smtp = self.connect_smtp_server(cr, uid, smtp_server, smtp_port,
+                    user_name=smtp_user, user_password=smtp_password, ssl=ssl, tls=True, debug=debug)
             try:
                 smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
             except Exception:
@@ -233,11 +227,16 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         """
         return "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
 
-    def send_email(self, cr, uid, smtp_from, smtp_to_list, message, id=None, subject=None, ssl=False,
-                    debug=False, smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
+    def send_email(self, cr, uid, smtp_from, email_to, subject, body, email_cc=None,
+                email_bcc=None, reply_to=False, attach=None, message_id=None,
+                references=None, openobject_id=False, debug=False, subtype='plain',
+                x_headers=None, priority='3', smtp_server=None, smtp_port=None,
+                ssl=False, smtp_user=None, smtp_password=None, id=None):
 
         """Send an email.
         """
+        if x_headers is None:
+            x_headers = {}
 
         if not (smtp_from or config['email_from']):
             raise ValueError("Sending an email requires either providing a sender "
@@ -246,48 +245,65 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         smtp_from = ustr(smtp_from).encode('utf-8')
 
         if id:
-            smtp_server = self.browse(cr, uid, id)
-        if not (id and smtp_server):
-            server = self.search(cr, uid, [], order='priority', limit=1)
-            smtp_server = self.browse(cr, uid, server[0])
-        if not id and smtp_server:
+            server = self.browse(cr, uid, id)
+            smtp_server = server.smtp_host
+            smtp_user = server.smtp_user
+            smtp_password = server.smtp_pass
+            smtp_port = server.smtp_port
+            ssl = server.smtp_ssl
+        elif not (id and smtp_server):
+            server_ids = self.search(cr, uid, [], order='priority', limit=1)
+            server = self.browse(cr, uid, server_ids[0])
+            smtp_server = server.smtp_host
+            smtp_user = server.smtp_user
+            smtp_password = server.smtp_pass
+            smtp_port = server.smtp_port
+            ssl = server.smtp_ssl
+        elif not id and smtp_server:
             smtp_server = smtp_server
+            smtp_user = smtp_user
+            smtp_password = smtp_password
+            smtp_port = smtp_port
+            ssl = ssl
 
-        email_body = ustr(message.body or '').encode('utf-8')
-        email_text = MIMEText(email_body or '',_charset='utf-8')
+        if not email_cc: email_cc = []
+        if not email_bcc: email_bcc = []
+        if not body: body = u''
+        email_body = ustr(body).encode('utf-8')
+        email_text = MIMEText(email_body or '', _subtype=subtype, _charset='utf-8')
         msg = MIMEMultipart()
 
-        openobject_id = message.res_id
-        if not message.message_id and openobject_id:
+        if not message_id and openobject_id:
             message_id = self.generate_tracking_message_id(openobject_id)
         else:
             message_id = Utils.make_msgid()
+
         msg['Message-Id'] = message_id
-
-        if message.references:
-            msg['references'] = message.references
-
-        if subject:
-            msg['Subject'] = Header(ustr(subject), 'utf-8')
+        if references:
+            msg['references'] = references
+        msg['Subject'] = Header(ustr(subject), 'utf-8')
         msg['From'] = smtp_from
-        msg['To'] = smtp_to_list
+
         del msg['Reply-To']
-        if message.reply_to:
-            msg['Reply-To'] = message.reply_to
+        if reply_to:
+            msg['Reply-To'] = reply_to
         else:
             msg['Reply-To'] = msg['From']
-        msg['Cc'] = message.email_cc or []
-        msg['Bcc'] = message.email_bcc or []
-        #msg['X-Priority'] = message.priority
+
+        msg['To'] = COMMASPACE.join(email_to)
+
+        if email_cc:
+            msg['Cc'] = COMMASPACE.join(email_cc)
+        if email_bcc:
+            msg['Bcc'] = COMMASPACE.join(email_bcc)
+
+        msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
         msg['Date'] = formatdate(localtime=True)
 
         # Add dynamic X Header
-        if message.headers:
-            x_headers = message.headers
-            for key, value in x_headers.iteritems():
-                msg['%s' % key] = str(value)
-
-        if html2text and message.sub_type == 'html':
+        for key, value in x_headers.iteritems():
+            msg['%s' % key] = str(value)
+        if html2text and sub_type == 'html':
             text = html2text(email_body.decode('utf-8')).encode('utf-8')
             alternative_part = MIMEMultipart(_subtype="alternative")
             alternative_part.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
@@ -296,19 +312,17 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         else:
             msg.attach(email_text)
 
-        attachments = []
-        for attach in message.attachment_ids:
-            attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
-        if attachments:
-            for (fname,fcontent) in attachments:
+        if attach:
+            for (fname, fcontent) in attach:
                 part = MIMEBase('application', "octet-stream")
                 part.set_payload( fcontent )
                 Encoders.encode_base64(part)
                 part.add_header('Content-Disposition', 'attachment; filename="%s"' % (fname,))
                 msg.attach(part)
 
-        res = self._email_send(cr, uid, smtp_from, smtp_to_list, msg, smtp_server=smtp_server.smtp_host,
-                               smtp_user=smtp_server.smtp_user, smtp_password=smtp_server.smtp_pass, smtp_port=smtp_server.smtp_port, debug=message.debug)
+        res = self._email_send(cr, uid, smtp_from, tools.flatten([email_to, email_cc, email_bcc]),
+                    msg, ssl=ssl, debug=debug, smtp_server=smtp_server, smtp_user=smtp_user,
+                    smtp_password=smtp_password, smtp_port=smtp_port)
         if res:
             return message_id
         return False
@@ -317,13 +331,13 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         smtp_port = 0
         if smtp_ssl:
             smtp_port = 465
-        return {'value':{'smtp_ssl':smtp_ssl,'smtp_tls':False,'smtp_port':smtp_port}}
+        return {'value': {'smtp_ssl':smtp_ssl, 'smtp_tls':False, 'smtp_port':smtp_port}}
 
     def on_change_tls(self, cr, uid, ids, smtp_tls):
         smtp_port = 0
         if smtp_tls:
             smtp_port = 0
-        return {'value':{'smtp_tls':smtp_tls,'smtp_ssl':False,'smtp_port':smtp_port}}
+        return {'value': {'smtp_tls':smtp_tls, 'smtp_ssl':False, 'smtp_port':smtp_port}}
 
 
 ir_mail_server()
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index af836a3c92e..f15f66afc75 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -74,5 +74,6 @@
         </record>
         <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" />
         <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
+        <menuitem name="Email Accounts" id="menu_email_smtp_server_all" parent="base.next_id_15" action="base.action_ir_mail_server_tree_all" sequence="15"/>
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py b/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py
index 61ddd70aa45..a141bfaf275 100644
--- a/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py
+++ b/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py
@@ -62,12 +62,11 @@ class partner_wizard_spam(osv.osv_memory):
                     to = '"%s" <%s>' % (name, adr.email)
     #TODO: add some tests to check for invalid email addresses
     #CHECKME: maybe we should use res.partner/email_send
-                    tools.email_send(data.email_from,
-                                     [to],
-                                     data.subject,
-                                     data.text,
-                                     subtype=type_,
-                                     openobject_id="res.partner-%s"%partner.id)
+                    smtp_server_obj = self.pool.get('ir.mail_server')
+                    smtp_server_obj.send_email(uid, data.email_from,
+                                     [to], data.subject,
+                                     data.text, subtype=type_,
+                                     cr=cr)
                     nbr += 1
             event_pool.create(cr, uid,
                     {'name': 'Email(s) sent through mass mailing',
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 41d0689a9e9..17ced2673d9 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -347,14 +347,6 @@ res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
 command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
 reference_re = re.compile("<.*-openobject-(\\d+)@(.*)>", re.UNICODE)
 
-priorities = {
-        '1': '1 (Highest)',
-        '2': '2 (High)',
-        '3': '3 (Normal)',
-        '4': '4 (Low)',
-        '5': '5 (Lowest)',
-    }
-
 def html2plaintext(html, body_id=None, encoding='utf-8'):
     ## (c) Fry-IT, www.fry-it.com, 2007
     ## <peter@fry-it.com>
@@ -421,7 +413,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
     return html
 
-def email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
+def email_send(uid, smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
            smtp_user=None, smtp_password=None, cr=None):
     if not cr:
         db_name = getattr(threading.currentThread(), 'dbname', None)

From 899815c3cde71594fd63cd469c5da3a6c544604c Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 30 Mar 2011 15:30:50 +0530
Subject: [PATCH 09/10] [IMP]: refactored send_email() of ir.mail_server

bzr revid: rha@tinyerp.com-20110330100050-aiuhkmb8je2w1p5b
---
 openerp/addons/base/ir/ir_mail_server.py | 143 +++++++++++++++--------
 openerp/tools/misc.py                    |   6 +-
 2 files changed, 96 insertions(+), 53 deletions(-)

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index d9a62f75b76..551690a70e8 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -227,7 +227,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         """
         return "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
 
-    def send_email(self, cr, uid, smtp_from, email_to, subject, body, email_cc=None,
+    def send_email(self, cr, uid, smtp_from, email_to, message=None, subject=None, body=None, email_cc=None,
                 email_bcc=None, reply_to=False, attach=None, message_id=None,
                 references=None, openobject_id=False, debug=False, subtype='plain',
                 x_headers=None, priority='3', smtp_server=None, smtp_port=None,
@@ -266,66 +266,107 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             smtp_port = smtp_port
             ssl = ssl
 
-        if not email_cc: email_cc = []
-        if not email_bcc: email_bcc = []
-        if not body: body = u''
-        email_body = ustr(body).encode('utf-8')
-        email_text = MIMEText(email_body or '', _subtype=subtype, _charset='utf-8')
-        msg = MIMEMultipart()
+        class WriteToLogger(object):
+            def __init__(self):
+                self.logger = loglevels.Logger()
 
-        if not message_id and openobject_id:
-            message_id = self.generate_tracking_message_id(openobject_id)
-        else:
-            message_id = Utils.make_msgid()
+            def write(self, s):
+                self.logger.notifyChannel('email_send', loglevels.LOG_DEBUG, s)
 
-        msg['Message-Id'] = message_id
-        if references:
-            msg['references'] = references
-        msg['Subject'] = Header(ustr(subject), 'utf-8')
-        msg['From'] = smtp_from
+        #preparing the message
+        if not message:
+            if not email_cc: email_cc = []
+            if not email_bcc: email_bcc = []
+            if not body: body = u''
+            email_body = ustr(body).encode('utf-8')
+            email_text = MIMEText(email_body or '', _subtype=subtype, _charset='utf-8')
+            msg = MIMEMultipart()
 
-        del msg['Reply-To']
-        if reply_to:
-            msg['Reply-To'] = reply_to
-        else:
-            msg['Reply-To'] = msg['From']
+            if not message_id and openobject_id:
+                message_id = self.generate_tracking_message_id(openobject_id)
+            else:
+                message_id = Utils.make_msgid()
 
-        msg['To'] = COMMASPACE.join(email_to)
+            msg['Message-Id'] = message_id
+            if references:
+                msg['references'] = references
+            msg['Subject'] = Header(ustr(subject), 'utf-8')
+            msg['From'] = smtp_from
 
-        if email_cc:
-            msg['Cc'] = COMMASPACE.join(email_cc)
-        if email_bcc:
-            msg['Bcc'] = COMMASPACE.join(email_bcc)
+            del msg['Reply-To']
+            if reply_to:
+                msg['Reply-To'] = reply_to
+            else:
+                msg['Reply-To'] = msg['From']
 
-        msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
-        msg['Date'] = formatdate(localtime=True)
+            msg['To'] = COMMASPACE.join(email_to)
 
-        # Add dynamic X Header
-        for key, value in x_headers.iteritems():
-            msg['%s' % key] = str(value)
-        if html2text and sub_type == 'html':
-            text = html2text(email_body.decode('utf-8')).encode('utf-8')
-            alternative_part = MIMEMultipart(_subtype="alternative")
-            alternative_part.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
-            alternative_part.attach(email_text)
-            msg.attach(alternative_part)
-        else:
-            msg.attach(email_text)
+            if email_cc:
+                msg['Cc'] = COMMASPACE.join(email_cc)
+            if email_bcc:
+                msg['Bcc'] = COMMASPACE.join(email_bcc)
 
-        if attach:
-            for (fname, fcontent) in attach:
-                part = MIMEBase('application', "octet-stream")
-                part.set_payload( fcontent )
-                Encoders.encode_base64(part)
-                part.add_header('Content-Disposition', 'attachment; filename="%s"' % (fname,))
-                msg.attach(part)
+            msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
+            msg['Date'] = formatdate(localtime=True)
+
+            # Add dynamic X Header
+            for key, value in x_headers.iteritems():
+                msg['%s' % key] = str(value)
+            if html2text and sub_type == 'html':
+                text = html2text(email_body.decode('utf-8')).encode('utf-8')
+                alternative_part = MIMEMultipart(_subtype="alternative")
+                alternative_part.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
+                alternative_part.attach(email_text)
+                msg.attach(alternative_part)
+            else:
+                msg.attach(email_text)
+
+            if attach:
+                for (fname, fcontent) in attach:
+                    part = MIMEBase('application', "octet-stream")
+                    part.set_payload( fcontent )
+                    Encoders.encode_base64(part)
+                    part.add_header('Content-Disposition', 'attachment; filename="%s"' % (fname,))
+                    msg.attach(part)
+            message = msg
+
+        try:
+            smtp_server = smtp_server or config['smtp_server']
+
+            if smtp_server.startswith('maildir:/'):
+                from mailbox import Maildir
+                maildir_path = smtp_server[8:]
+                mdir = Maildir(maildir_path,factory=None, create = True)
+                mdir.add(message.as_string(True))
+                return True
+
+            if debug:
+                oldstderr = smtplib.stderr
+                smtplib.stderr = WriteToLogger()
+
+            if not ssl:
+                ssl = config.get('smtp_ssl', False)
+
+            smtp = self.connect_smtp_server(cr, uid, smtp_server, smtp_port,
+                    user_name=smtp_user, user_password=smtp_password, ssl=ssl, tls=True, debug=debug)
+            try:
+                smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
+            except Exception:
+                _logger.error('could not deliver Email(s)', exc_info=True)
+                return False
+            finally:
+                try:
+                    smtp.quit()
+                except Exception:
+                    # ignored, just a consequence of the previous exception
+                    pass
+
+            if debug:
+                smtplib.stderr = oldstderr
+        except Exception:
+            _logger.error('Error on Send Emails Services', exc_info=True)
 
-        res = self._email_send(cr, uid, smtp_from, tools.flatten([email_to, email_cc, email_bcc]),
-                    msg, ssl=ssl, debug=debug, smtp_server=smtp_server, smtp_user=smtp_user,
-                    smtp_password=smtp_password, smtp_port=smtp_port)
-        if res:
             return message_id
-        return False
 
     def on_change_ssl(self, cr, uid, ids, smtp_ssl):
         smtp_port = 0
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 17ced2673d9..f82702f02e1 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -413,14 +413,16 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
     return html
 
-def email_send(uid, smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
-           smtp_user=None, smtp_password=None, cr=None):
+def email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_server=None, smtp_port=None,
+           smtp_user=None, smtp_password=None, cr=None, uid=None):
     if not cr:
         db_name = getattr(threading.currentThread(), 'dbname', None)
         if db_name:
             cr = pooler.get_db_only(db_name).cursor()
         else:
             raise Exception("No database cursor found!")
+    if not uid:
+        uid = 1
     try:
         server_pool = pooler.get_pool(cr.dbname).get('ir.mail_server')
         server_pool.send_email(cr, uid, smtp_from, smtp_to_list, message,

From 707efc0d340df62f2fb79f051de0b2273e50fa18 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 30 Mar 2011 19:03:31 +0530
Subject: [PATCH 10/10] [IMP]: ir_mail_server.py: removed _email_send() and
 merge with email_send()

bzr revid: rha@tinyerp.com-20110330133331-3r1wpr4pepdont6x
---
 openerp/addons/base/ir/ir_mail_server.py | 61 +-----------------------
 openerp/tools/misc.py                    |  2 +-
 2 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 551690a70e8..02700302325 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -163,63 +163,6 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             raise error
         return smtp_server
 
-    def _email_send(self, cr, uid, smtp_from, smtp_to_list, message, ssl=False,
-                debug=False, smtp_server=None, smtp_port=None, smtp_user=None, smtp_password=None):
-        """Low-level method to send directly a Message through the configured smtp server.
-            :param smtp_from: RFC-822 envelope FROM (not displayed to recipient)
-            :param smtp_to_list: RFC-822 envelope RCPT_TOs (not displayed to recipient)
-            :param message: an email.message.Message to send
-            :param debug: True if messages should be output to stderr before being sent,
-                          and smtplib.SMTP put into debug mode.
-            :return: True if the mail was delivered successfully to the smtp,
-                     else False (+ exception logged)
-        """
-        class WriteToLogger(object):
-            def __init__(self):
-                self.logger = loglevels.Logger()
-
-            def write(self, s):
-                self.logger.notifyChannel('email_send', loglevels.LOG_DEBUG, s)
-
-        try:
-            smtp_server = smtp_server or config['smtp_server']
-
-            if smtp_server.startswith('maildir:/'):
-                from mailbox import Maildir
-                maildir_path = smtp_server[8:]
-                mdir = Maildir(maildir_path,factory=None, create = True)
-                mdir.add(message.as_string(True))
-                return True
-
-            if debug:
-                oldstderr = smtplib.stderr
-                smtplib.stderr = WriteToLogger()
-
-            if not ssl:
-                ssl = config.get('smtp_ssl', False)
-
-            smtp = self.connect_smtp_server(cr, uid, smtp_server, smtp_port,
-                    user_name=smtp_user, user_password=smtp_password, ssl=ssl, tls=True, debug=debug)
-            try:
-                smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
-            except Exception:
-                _logger.error('could not deliver Email(s)', exc_info=True)
-                return False
-            finally:
-                try:
-                    smtp.quit()
-                except Exception:
-                    # ignored, just a consequence of the previous exception
-                    pass
-
-            if debug:
-                smtplib.stderr = oldstderr
-        except Exception:
-            _logger.error('Error on Send Emails Services', exc_info=True)
-            return False
-
-        return True
-
     def generate_tracking_message_id(self, openobject_id):
         """Returns a string that can be used in the Message-ID RFC822 header field so we
            can track the replies related to a given object thanks to the "In-Reply-To" or
@@ -350,7 +293,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             smtp = self.connect_smtp_server(cr, uid, smtp_server, smtp_port,
                     user_name=smtp_user, user_password=smtp_password, ssl=ssl, tls=True, debug=debug)
             try:
-                smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
+                smtp.sendmail(smtp_from, email_to, message.as_string())
             except Exception:
                 _logger.error('could not deliver Email(s)', exc_info=True)
                 return False
@@ -366,7 +309,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         except Exception:
             _logger.error('Error on Send Emails Services', exc_info=True)
 
-            return message_id
+        return message_id
 
     def on_change_ssl(self, cr, uid, ids, smtp_ssl):
         smtp_port = 0
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index f82702f02e1..d3edc80f4ba 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -425,7 +425,7 @@ def email_send(smtp_from, smtp_to_list, message, ssl=False, debug=False, smtp_se
         uid = 1
     try:
         server_pool = pooler.get_pool(cr.dbname).get('ir.mail_server')
-        server_pool.send_email(cr, uid, smtp_from, smtp_to_list, message,
+        server_pool.send_email(cr, uid, smtp_from, smtp_to_list, message=message,
             ssl=ssl,debug=debug, smtp_server=smtp_server, smtp_port=smtp_port,
             smtp_user=smtp_user, smtp_password=smtp_password)
     except Exception: