Issue 535 - Contact form cannot deal with commas in sender`s name

sitescripts/reports/bin/mailDigests.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus 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 General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import MySQLdb, os, sys, re, marshal
 from datetime import date
 from time import time
 from email.utils import parseaddr
 from sitescripts.utils import get_config, setupStderr
-from sitescripts.templateFilters import formatmime
+from sitescripts.templateFilters import formatmime, emailaddr
 from sitescripts.reports.utils import mailDigest, getReports, getReportSubscriptions, calculateReportSecret, getDigestId, getDigestSecret, getUserUsefulnessScore
 import sitescripts.subscriptions.subscriptionParser as subscriptionParser
 
 def loadSubscriptions():
   global interval, weekDay
 
   subscriptions = subscriptionParser.readSubscriptions()
 
   results = {}
   resultList = []
@@ skipping 86 matching lines @@
 
     sendMail(subscription, groups)
 
 def sendMail(subscription, groups):
   if hasattr(subscription, 'email'):
     email = subscription.email
   else:
     email = subscription['email']
 
   name, address = parseaddr(email)
-  email = formatmime(name) + ' <' + formatmime(address) + '>'
-  
+  email = formatmime(emailaddr((name, address)))
+
   id = getDigestId(address)
   digestLink = get_config().get('reports', 'urlRoot') + 'digest?id=%s&secret=%s' % (id, getDigestSecret(id, date.today().isocalendar()))
 
   mailDigest({'email': email, 'digestLink': digestLink, 'subscription': subscription, 'groups': groups})
 
 def calculateReportWeight(report, subscriptions):
   global currentTime, startTime
 
   weight = 1.0
   if report['type'] == 'false positive' or report['type'] == 'false negative':
@@ skipping 34 matching lines @@
   if interval == 'week':
     startTime = currentTime - 7*24*60*60
   elif interval == 'day':
     startTime = currentTime - 24*60*60
 
   fakeSubscription = {'url': 'https://fake.adblockplus.org', 'name': get_config().get('reports', 'defaultSubscriptionName'), 'email': get_config().get('reports', 'defaultSubscriptionRecipient')}
   subscriptions, subscriptionList = loadSubscriptions()
   subscriptionList.append(fakeSubscription)
   reports = scanReports()
   sendNotifications(reports)