Revision d2c9adac snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
48 | 48 |
from django.http import Http404 |
49 | 49 |
|
50 | 50 |
from urllib import quote |
51 |
from urlparse import urljoin |
|
52 | 51 |
from smtplib import SMTPException |
53 | 52 |
from datetime import datetime |
54 | 53 |
from functools import wraps |
55 | 54 |
|
55 |
from synnefo.lib import join_urls |
|
56 | 56 |
from astakos.im.settings import ( |
57 | 57 |
CONTACT_EMAIL, SITENAME, BASEURL, LOGGING_LEVEL, |
58 | 58 |
VERIFICATION_EMAIL_SUBJECT, ACCOUNT_CREATION_SUBJECT, |
... | ... | |
104 | 104 |
|
105 | 105 |
Raises SendVerificationError |
106 | 106 |
""" |
107 |
url = '%s?auth=%s&next=%s' % (urljoin(BASEURL, reverse('activate')),
|
|
107 |
url = '%s?auth=%s&next=%s' % (join_urls(BASEURL, reverse('activate')),
|
|
108 | 108 |
quote(user.auth_token), |
109 |
quote(urljoin(BASEURL, reverse('index'))))
|
|
109 |
quote(join_urls(BASEURL, reverse('index'))))
|
|
110 | 110 |
message = render_to_string(template_name, { |
111 | 111 |
'user': user, |
112 | 112 |
'url': url, |
... | ... | |
192 | 192 |
Raises SendInvitationError |
193 | 193 |
""" |
194 | 194 |
subject = _(INVITATION_EMAIL_SUBJECT) |
195 |
url = '%s?code=%d' % (urljoin(BASEURL, reverse('index')), invitation.code)
|
|
195 |
url = '%s?code=%d' % (join_urls(BASEURL, reverse('index')), invitation.code)
|
|
196 | 196 |
message = render_to_string(template_name, { |
197 | 197 |
'invitation': invitation, |
198 | 198 |
'url': url, |
... | ... | |
223 | 223 |
subject = _(GREETING_EMAIL_SUBJECT) |
224 | 224 |
message = render_to_string(email_template_name, { |
225 | 225 |
'user': user, |
226 |
'url': urljoin(BASEURL, reverse('index')),
|
|
226 |
'url': join_urls(BASEURL, reverse('index')),
|
|
227 | 227 |
'baseurl': BASEURL, |
228 | 228 |
'site_name': SITENAME, |
229 | 229 |
'support': CONTACT_EMAIL}) |
Also available in: Unified diff