[IMP] mass_mailing: remove depends to website. Create a website_mass_mailing bridge to add subscribe snippet into website builder. Split website_links to have link_tracker to create short and trackable URLs, and website_links to have a website layout for link_tracker and add button to share page.

1 files changed, 2 insertions, 64 deletions

diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 2a86ceaaef6..035d22ef09d 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -19,70 +19,8 @@ class MassMailController(http.Controller):
 
         return response
 
-    @http.route(['/mail/mailing/<int:mailing_id>/unsubscribe'], type='http', website=True, auth='none')
-    def mailing(self, mailing_id, email=None, res_id=None, **post):
-        mailing = request.env['mail.mass_mailing'].sudo().browse(mailing_id)
-        if mailing.exists():
-            if mailing.mailing_model == 'mail.mass_mailing.contact':
-                contacts =request.env['mail.mass_mailing.contact'].sudo().search([('email', 'ilike', email)])
-                return request.website.render('mass_mailing.page_unsubscribe', {'contacts': contacts, 'email': email, 'mailing_id':mailing_id})
-            else:
-                mailing.update_opt_out(mailing_id, email, [res_id], True)
-                return request.website.render('mass_mailing.page_unsubscribed')
-
-    @http.route(['/mail/mailing/unsubscribe'], type='json', auth='none')
-    def unsubscribe(self, mailing_id, opt_in_ids, opt_out_ids, email):
-        mailing = request.env['mail.mass_mailing'].sudo().browse(mailing_id)
-        if mailing.exists():
-            mailing.update_opt_out(mailing_id, email, opt_in_ids, False)
-            mailing.update_opt_out(mailing_id, email, opt_out_ids, True) 
-
-    @http.route('/website_mass_mailing/is_subscriber', type='json', website=True, auth="public")
-    def is_subscriber(self, list_id, **post):
-        cr, uid, context = request.cr, request.uid, request.context
-        Contacts = request.registry['mail.mass_mailing.contact']
-        Users = request.registry['res.users']
-
-        is_subscriber = False
-        email = None
-        if uid != request.website.user_id.id:
-            email = Users.browse(cr, SUPERUSER_ID, uid, context).email
-        elif request.session.get('mass_mailing_email'):
-            email = request.session['mass_mailing_email']
-
-        if email:
-            contact_ids = Contacts.search(cr, SUPERUSER_ID, [('list_id', '=', int(list_id)), ('email', '=', email), ('opt_out', '=', False)], context=context)
-            is_subscriber = len(contact_ids) > 0
-
-        return {'is_subscriber': is_subscriber, 'email': email}
-
-    @http.route('/website_mass_mailing/subscribe', type='json', auth="public")
-    def subscribe(self, list_id, email, **post):
-        cr, uid, context = request.cr, request.uid, request.context
-        Contacts = request.registry['mail.mass_mailing.contact']
-
-        contact_ids = Contacts.search_read(cr, SUPERUSER_ID, [('list_id', '=', int(list_id)), ('email', '=', email)], ['opt_out'], context=context)
-        if not contact_ids:
-            Contacts.add_to_list(cr, SUPERUSER_ID, email, int(list_id), context=context)
-        else:
-            if contact_ids[0]['opt_out']:
-                Contacts.write(cr, SUPERUSER_ID, [contact_ids[0]['id']], {'opt_out': False}, context=context)
-        # add email to session
-        request.session['mass_mailing_email'] = email
-        return True
-
     @http.route('/r/<string:code>/m/<int:stat_id>', type='http', auth="none")
     def full_url_redirect(self, code, stat_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
-        request.registry['website.links.click'].add_click(cr, uid, code, request.httprequest.remote_addr, request.session['geoip'].get('country_code'), stat_id=stat_id, context=context)
-        return werkzeug.utils.redirect(request.registry['website.links'].get_url_from_code(cr, uid, code, context=context), 301)
-
-    @http.route(['/website_mass_mailing/get_content'], type='json', auth="public")
-    def get_mass_mailing_content(self, newsletter_id, **post):
-        data = self.is_subscriber(newsletter_id, **post)
-        mass_mailing_list = request.registry['mail.mass_mailing.list'].browse(request.cr, SUPERUSER_ID, int(newsletter_id), request.context)
-        data.update({
-            'content': mass_mailing_list.popup_content,
-            'redirect_url': mass_mailing_list.popup_redirect_url
-            })
-        return data
+        request.registry['link.tracker.click'].add_click(cr, uid, code, request.httprequest.remote_addr, request.session['geoip'].get('country_code'), stat_id=stat_id, context=context)
+        return werkzeug.utils.redirect(request.registry['link.tracker'].get_url_from_code(cr, uid, code, context=context), 301)