Merge pull request openlabs#11 from zikzakmedia/master

[IMP] Check emails is valid. If not valid, this email go to draft mailbox

Author: Sharoon Thomas

poweremail_mailbox.py

@@ -31,6 +31,8 @@
 from tools.translate import _
 import tools
 
+import re
+
 LOGGER = netsvc.Logger()
 
 class PoweremailMailbox(osv.osv):
@@ -157,6 +159,27 @@ def complete_mail(self, cr, uid, ids, context=None):
             self.pool.get('poweremail.core_accounts').get_fullmail(cr, uid, id, context)
             self.historise(cr, uid, [id], "Full email downloaded", context)
 
+    def check_email_valid(self, email):
+        """Check if email is valid. Check @ and .
+        :email str
+        return True/False
+        """
+        def get_validate_email(email):
+            if not re.match(r"^[A-Za-z0-9\.\+_-]+@[A-Za-z0-9\._-]+\.[a-zA-Z]*$", email):
+                return False
+            return True
+
+        if not email:
+            return False
+
+        emails = email.split(',')
+        if len(emails)>0:
+            for email in emails:
+                if not get_validate_email(email):
+                    return False
+                    break
+        return True
+
     _columns = {
             'pem_from':fields.char(
                             'From',

poweremail_send_wizard.py

@@ -28,6 +28,7 @@
 import netsvc
 import base64
 import time
+import re
 from tools.translate import _
 import tools
 from poweremail_template import get_value
@@ -190,8 +191,24 @@ def sav_to_drafts(self, cr, uid, ids, context=None):
     def send_mail(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        mailbox_obj = self.pool.get('poweremail.mailbox')
+        values = {'folder':'outbox'}
+        check_email = True
+
         mailid = self.save_to_mailbox(cr, uid, ids, context)
-        if self.pool.get('poweremail.mailbox').write(cr, uid, mailid, {'folder':'outbox'}, context):
+
+        if len(mailid)>0:
+            mail = mailbox_obj.browse(cr, uid, mailid[0], context)
+            check_email = mail.pem_to and mailbox_obj.check_email_valid(mail.pem_to) or False
+            if mail.pem_cc:
+                check_email = check_email and mailbox_obj.check_email_valid(mail.pem_cc)
+            if mail.pem_bcc:
+                check_email = check_email and mailbox_obj.check_email_valid(mail.pem_bcc)
+
+        if not check_email:
+            values = {'folder':'drafts'}
+
+        if mailbox_obj.write(cr, uid, mailid, values, context):
             return {'type':'ir.actions.act_window_close' }
 
     def get_generated(self, cr, uid, ids=None, context=None):