extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-01-19 04:19:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check format of DEFAULT_FROM_EMAIL before creating messages, to address #608

Browse Source
This commit is contained in:
Garret Wassermann 2018-06-27 02:10:20 -04:00
parent c3bf39a3b9
commit 08fc9b5aac
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helpdesk/models.py
View File

@ -17,6 +17,7 @@ from django.utils import timezone
from django.utils import six from django.utils import six
from django.utils.translation import ugettext_lazy as _, ugettext from django.utils.translation import ugettext_lazy as _, ugettext
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
import re
@python_2_unicode_compatible @python_2_unicode_compatible
@ -278,7 +279,13 @@ class Queue(models.Model):
in the sender name field, so hopefully the admin can see and fix it. in the sender name field, so hopefully the admin can see and fix it.
""" """
if not self.email_address: if not self.email_address:
return u'NO QUEUE EMAIL ADDRESS DEFINED <%s>' % settings.DEFAULT_FROM_EMAIL # must check if given in format "Foo <foo@example.com>"
default_email = re.match(".*<(?P<email>.*@*.)>", settings.DEFAULT_FROM_EMAIL)
if default_email is not None:
# already in the right format, so just include it here
return u'NO QUEUE EMAIL ADDRESS DEFINED %s' % settings.DEFAULT_FROM_EMAIL
else:
return u'NO QUEUE EMAIL ADDRESS DEFINED <%s>' % settings.DEFAULT_FROM_EMAIL
else: else:
return u'%s <%s>' % (self.title, self.email_address) return u'%s <%s>' % (self.title, self.email_address)
from_address = property(_from_address) from_address = property(_from_address)