From 9f8e3f5893f5304e2eaab7bbd8158375dd71ec54 Mon Sep 17 00:00:00 2001
From: Olivier Sarrat <olivier.sarrat@laposte.net>
Date: Wed, 3 May 2017 19:16:10 +0200
Subject: [PATCH] groupeurd_newsletter v0.3: robust unsubscribe

Robust and fully flexible html_version and unsubscribe url.
---
 groupeurd_newsletter/__init__.pyc             | Bin 212 -> 0 bytes
 groupeurd_newsletter/__openerp__.py           |   7 +-
 groupeurd_newsletter/controllers.pyc          | Bin 1154 -> 0 bytes
 groupeurd_newsletter/models.py                |  81 +++++++++++++++++-
 groupeurd_newsletter/models.pyc               | Bin 1942 -> 0 bytes
 .../newsletter-en-template.xml                |   4 +-
 .../newsletter-fr-template.xml                |   4 +-
 7 files changed, 87 insertions(+), 9 deletions(-)
 delete mode 100644 groupeurd_newsletter/__init__.pyc
 delete mode 100644 groupeurd_newsletter/controllers.pyc
 delete mode 100644 groupeurd_newsletter/models.pyc

diff --git a/groupeurd_newsletter/__init__.pyc b/groupeurd_newsletter/__init__.pyc
deleted file mode 100644
index 962f5819665082c3b0a334d021b6ad0c286b4c6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 212
zcmYLDO9}!p3~d!e{M^6;%tm_w5y8D17s71HFsV}PG(*yH@X{{y0Gf*EBYAl*ge1e~
zeDb*7kG1+@AayIr3n7ruDkxR{v{t3g%|nqV{Y$X_$TSk)Ah^J3Dze6y2t#nhg;@0`
z-ibAh178_FSp>vok8}Y~rUJmorX>V(ChS_*5!mQ@4lX4}##$eJvUb(p(pdJa<zyG!
KCV#`3X8H}{2{m8<

diff --git a/groupeurd_newsletter/__openerp__.py b/groupeurd_newsletter/__openerp__.py
index 1981783..563079b 100644
--- a/groupeurd_newsletter/__openerp__.py
+++ b/groupeurd_newsletter/__openerp__.py
@@ -15,12 +15,13 @@
 		- Ajouter un champ "unsubscribed_by_odoo_user" qui sera manipulé pour les désincriptions par interface
 		- Afficher champ create_uid pour savoir provenance des contacts
 		- Ne garder que les modèles de courriel de newsletter dans Publipostages/Modèles de courriel
-		- Retrait insertion automatique lien désinscription
-		- Message de confirmation de désincription plus verbeux
 		- Modèles de newsletter spécifiques
+		- Lien vers version HTML (format proposé: __HTML_VERSION_URL__)
+		- Placement libre du lien de désinscription (format proposé: __UNSUBSCRIBE_URL__)
 		
 		En projet:
 		- Ecraser les propriétés d'un publipostage par les propriétés standard d'un modèle de courriel au moment de la sélection de ce dernier.
+		- Message de confirmation de désincription plus verbeux.
     """,
 
     'author': "Groupe URD",
@@ -30,7 +31,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Marketing',
-    'version': '0.2',
+    'version': '0.3',
 
     # any module necessary for this one to work correctly
     'depends': ['base','mass_mailing','marketing','website_mail'],
diff --git a/groupeurd_newsletter/controllers.pyc b/groupeurd_newsletter/controllers.pyc
deleted file mode 100644
index 2a4525e6a392d3121bbf6628b9584970b58322e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1154
zcmcIj&2G~`5T3Q2pN1a=gg}+Jf{X<53$zuYEr>%S<S0V;vU0PV#AWR@yX!=i%BegF
zugH-D%&gNiy@TZ)&y06=zWHW0{Pke4|MU0f8El>qzi)9_@(6qxD1eed#-I!!3xJU~
z02M+RK^C=k2&w~R7qV_^N1%F8_95$|-2utqVh`pFL>GPlTmyW`1|WJciTjwR_=8Uz
zpynbJOXq5LAC<}U(`h=LoTmKaNzCYX4~3E68fjhYc#Mv-+}g9eP{+D*Mk^&v`;Q{H
zdxG+V(M>I<=?NdpwN=tNX|^R(%6GWzOB52QQW?NSxG5iNy=F{=9ysz4K{|;k#=b(4
zRNDiSr7IO*Nn;CL@q-dkm58dS7Q7HgzOuY=OV`D)x;a<HY(^y$<8<6HF8dmV1GqrG
z0^)w3V4xPl6@z&Q3x;6edjMC6Fhcq$a%>-=q+BCP$~RdZon8n>G#thqlqoJqJ<pU?
zRx1z2%G}JBZVz4OT3m9fBc=@=vz2P@9-?)(Am5<fbTMuLFYJ5Nl2VEyPwbp)q4k@!
zHeW?yl3WN~*`zjFBn#h_#t6Pc;%wVQJE||;b3AHQ$o0+^kMD+O0&R%|2wpH>q@#)A
zyvj?-xf^(+)S^*ndIB6#fvKHLhp64+{@37BN<?TZQQl?a_#S@!4C`7}($sB3{AAO-
zZ@eSA0BxIS9&WrXb$41k+GPvdUZuWm&vv4m*2<2Y$t$aJESb3StlZufkMsZ0;2Uz#
Rw%~}Eu*AtzHVlTi{sK%+8EgOm

diff --git a/groupeurd_newsletter/models.py b/groupeurd_newsletter/models.py
index cb723e9..afd7498 100644
--- a/groupeurd_newsletter/models.py
+++ b/groupeurd_newsletter/models.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
+import urlparse
+import werkzeug.urls
+
 from openerp import models, fields, api
 from openerp.osv import osv
 
+from openerp import tools
 from openerp.tools.translate import _
 
 # Overrides mass mailing Contact for this module purpose
@@ -35,11 +39,84 @@ class MailMail(osv.Model):
 	"""Add the mass mailing campaign data to mail"""
 	_name = 'mail.mail'
 	_inherit = ['mail.mail']
-	
+
 	def _get_unsubscribe_url(self, cr, uid, mail, email_to, msg=None, context=None):
-		return ""
+		base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+		url = urlparse.urljoin(
+			base_url, 'mail/mailing/%(mailing_id)s/unsubscribe?%(params)s' % {
+				'mailing_id': mail.mailing_id.id,
+				'params': werkzeug.url_encode({'db': cr.dbname, 'res_id': mail.res_id, 'email': email_to})
+			}
+		)
+		return '%s' % url
+
+	def _get_html_version_url(self, cr, uid, mail, email_to, context=None):
+		base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+		url = urlparse.urljoin(base_url, 'newsletter/html_version_%s' % mail.mailing_id.id)
+		return '%s' % url
+
+	def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
+	
+		email_to = self.send_get_mail_to(cr, uid, mail, partner=partner, context=context)
+		body = self.send_get_mail_body(cr, uid, mail, partner=partner, context=context)		
+		
+		if mail.mailing_id and body and email_to:
+			emails = tools.email_split(email_to[0])
+			has_email_to = emails and emails[0] or False
+			unsubscribe_url = self._get_unsubscribe_url(cr, uid, mail, has_email_to, context=context)
+			if unsubscribe_url:
+				body = body.replace('__UNSUBSCRIBE_URL__', unsubscribe_url)
+			html_version_url = self._get_html_version_url(cr, uid, mail, has_email_to, context=context)
+			body = body.replace('__HTML_VERSION_URL__', html_version_url)
+			
+		body_alternative = tools.html2plaintext(body)
+		
+		res = {
+			'body': body,
+			'body_alternative': body_alternative,
+			'subject': self.send_get_mail_subject(cr, uid, mail, partner=partner, context=context),
+			'email_to': email_to,
+		}
+		
+		return res
 
 
+
+class TestMassMailing(osv.TransientModel):
+	_name = 'mail.mass_mailing.test'
+	_description = 'Sample Mail Wizard'
+
+	email_to = fields.Char('Recipients', required=True,help='Comma-separated list of email addresses.',default=lambda self: self.pool['mail.message']._get_default_from(self.env.cr, self.env.user.id, context=self.env.context))
+	mass_mailing_id = fields.Many2one('mail.mass_mailing', 'Mailing', required=True, ondelete='cascade')
+
+	def send_mail_test(self, cr, uid, ids, context=None):
+		Mail = self.pool['mail.mail']
+		for wizard in self.browse(cr, uid, ids, context=context):
+			mailing = wizard.mass_mailing_id
+			test_emails = tools.email_split(wizard.email_to)
+			mail_ids = []
+			for test_mail in test_emails:
+				mail_values = {
+					'email_from': mailing.email_from,
+					'reply_to': mailing.reply_to,
+					'email_to': test_mail,
+					'subject': mailing.name,
+					'body_html': '',
+					'notification': True,
+					'mailing_id': mailing.id,
+					'attachment_ids': [(4, attachment.id) for attachment in mailing.attachment_ids],
+				}
+				mail_mail_obj = Mail.browse(cr, uid, Mail.create(cr, uid, mail_values, context=context), context=context)
+				unsubscribe_url = Mail._get_unsubscribe_url(cr, uid, mail_mail_obj, test_mail, context=context)
+				html_version_url = Mail._get_html_version_url(cr, uid, mail_mail_obj, test_mail, context=context)
+				body = mailing.body_html.replace('__UNSUBSCRIBE_URL__', unsubscribe_url)
+				body = mailing.body_html.replace('__HTML_VERSION_URL__', html_version_url)
+				Mail.write(cr, uid, mail_mail_obj.id, {'body_html': mailing.body_html}, context=context)
+				mail_ids.append(mail_mail_obj.id)
+			Mail.send(cr, uid, mail_ids, context=context)
+			self.pool['mail.mass_mailing'].write(cr, uid, [mailing.id], {'state': 'test'}, context=context)
+		return True
+	
 #class MassMailing(osv.Model):
 	#_name = "mail.mass_mailing"
 	#_inherit = "mail.mass_mailing"
diff --git a/groupeurd_newsletter/models.pyc b/groupeurd_newsletter/models.pyc
deleted file mode 100644
index 3ddcf6cc48e0ba0c05f8d750e98d342435c14b8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1942
zcmcIlOOG2x5U!c=b3<S;1hfdDflCZZY$@W15CN{cNV7r+Us~howzr*`ZfCkD8%x|a
z|CFD=kpp~H<Lr|AGIp2iHQn|2s-6Ay@Z`_<_iq&)pA5f0V1*V$<C{=T)FiY@s7Yy+
zQj^gtql9fK)dOmVv>NtuM)ioAF|Eds2V@f3O=y#l9?~148=~J=Q_>?c!?%X<t>J|9
zgf8b(9Bco<Gv`R+2&D1a)Ir#dHMI_rP37Ls6Lw+2hgZG88WqQ&m3OhMVg**70qBod
z;RT2x&Ic(VAEp_Z0qusIEt0ySWQ8E18I#ULIiQ;)Sxq<-jvrZ!p`lGiTa@O6%mdoJ
z#~DDWr;-%(52?7EpYWk)AWdoOMN@{Ln6qxXIL0Wch1fzBK7!+~E_CZqwRRt^ceyU3
z30#-fghdxj8^Ra=^;#R9uMc^=vLXLPd!MsU{17gN4^p)aQFYF~>`eF++MdnlVttZ}
z+3K&ux3FFI2d_<=mvw7OeaKt0#RjIuDI4GR#~c%ocNbD_zmLjyvEl~sO0j;z3QYbW
z+9CX>6oH78b{S&<N;MD@&@d8lOm4>g=uJlkJwRO2-V1?8F~OFF^q#q&QJ!cUBS3Ke
zI&ulScS@+Zgkm@DRUELLOT<mNbwm}_`k*`tsKm-{7v7m3SS$roZ|3+VA>lc=Wn;80
zmti9>KE3ws3vJtFskL`uxo^E*Zd>2&P1kDW%yp<uL@k#+rWgBz^vOF_U6pQY)Uk}8
z@M#PjN~g&znSsvVhZH$srCiw<r6M~hg{``p#UYDq>b<PHGOdk$p*ValRPg|e*w0IM
zc!u-}-nU?TJOxqVWvzfqz_GM0hJqU@FL>9-STM5g%5aahC^!QKdf-S#2|np8d6Z>I
zmdvta)V4kcsBgzQgQtx36EN?LHRexdmj`qpa||)1H@L(`JeShZZ}8T0t$}Kj^Js#|
zXy#Sf>`S|q=_~W-#UNA29vEZ9z}E~fh9bi}@Rs@xtgJ6S0GYE_!AV6fXVnT8JF5kY
zyq6@`k8AW|ZNm2U9y71wUBT}OcON4VwKaS*9B-SoQC(X<hCXnVlw9<2&%hTvR1%L;
z+E+>y{C@F>31?V*333<XeS+dM?EDp0n1Bc<l4*J|7a((8{oXj!?hCN}t<Xc3?MKrB
ze-8x%CGz$6RvEpo!vZjOq2|eu5nu$K^Z$)tvEZ}+m#n1U-}R&WJ%=XQeV&}Ar`g%r
Ezgxw^sQ>@~

diff --git a/groupeurd_newsletter/newsletter-en-template.xml b/groupeurd_newsletter/newsletter-en-template.xml
index f6042f1..dba61d9 100644
--- a/groupeurd_newsletter/newsletter-en-template.xml
+++ b/groupeurd_newsletter/newsletter-en-template.xml
@@ -16,7 +16,7 @@
 <div id="header">
 	<p style="font-family: Arial,Helvetica,sans-serif; font-size: 11px; color: rgb(145, 145, 145); text-align: center;">
 	If you can't see this newsletter properly,
-	<a href="/newsletter/html_version_${ctx['params']['id']}" style="color: rgb(246, 170, 66); text-decoration: underline;">click here</a></p>
+	<a href="__HTML_VERSION_URL__" style="color: rgb(246, 170, 66); text-decoration: underline;">click here</a></p>
 	<table style="background-color: rgb(244, 244, 244);" align="center" border="0" cellpadding="0" cellspacing="0" width="640">
 	<tbody>
 	<tr>
@@ -336,7 +336,7 @@
 	© Groupe URD - La Fontaine des Marins - 26170 PLAISIANS - Tel :+33 (0)4
 	75 28 29 35 - <a href="http://www.urd.org/" style="color: rgb(246, 170, 66); text-decoration: underline;">www.urd.org</a>
 	<br>
-	<a href="/mail/mailing/${ctx['params']['id']}/unsubscribe?res_id=${object.id}&amp;db=groupeurd&amp;email=${object.email}" style="color: rgb(246, 170, 66); text-decoration: underline;">Unsubscribe</a></p>
+	<a href="__UNSUBSCRIBE_URL__" style="color: rgb(246, 170, 66); text-decoration: underline;">Unsubscribe</a></p>
 </div>
 
 
diff --git a/groupeurd_newsletter/newsletter-fr-template.xml b/groupeurd_newsletter/newsletter-fr-template.xml
index 6efb43e..988f07c 100644
--- a/groupeurd_newsletter/newsletter-fr-template.xml
+++ b/groupeurd_newsletter/newsletter-fr-template.xml
@@ -16,7 +16,7 @@
 <div id="header">
 	<p style="font-family: Arial,Helvetica,sans-serif; font-size: 11px; color: rgb(145, 145, 145); text-align: center;">
 	Si cet email ne s'affiche pas correctement, vous pouvez le visualiser
-	grâce à <a href="/newsletter/html_version_${ctx['params']['id']}" style="color: rgb(246, 170, 66); text-decoration: underline;">ce
+	grâce à <a href="__HTML_VERSION_URL__" style="color: rgb(246, 170, 66); text-decoration: underline;">ce
 	lien</a></p>
 	<table style="background-color: rgb(244, 244, 244);" align="center" border="0" cellpadding="0" cellspacing="0" width="640">
 	<tbody>
@@ -347,7 +347,7 @@
 	© Groupe URD - La Fontaine des Marins - 26170 PLAISIANS - Tel :+33 (0)4
 	75 28 29 35 - <a href="http://www.urd.org/" style="color: rgb(246, 170, 66); text-decoration: underline;">www.urd.org</a>
 	<br>
-	<a href="/mail/mailing/${ctx['params']['id']}/unsubscribe?res_id=${object.id}&amp;db=groupeurd&amp;email=${object.email}" style="color: rgb(246, 170, 66); text-decoration: underline;">Se désinscrire</a></p>
+	<a href="__UNSUBSCRIBE_URL__" style="color: rgb(246, 170, 66); text-decoration: underline;">Se désinscrire</a></p>
 </div>