Revision fdb1f9ec
| b/flowspec/views.py | ||
|---|---|---|
| 31 | 31 |
|
| 32 | 32 |
from django.views.decorators.cache import never_cache |
| 33 | 33 |
from django.conf import settings |
| 34 |
from django.core.mail import mail_admins, mail_managers, send_mail
|
|
| 34 |
from django.core.mail.message import EmailMessage
|
|
| 35 | 35 |
import datetime |
| 36 | 36 |
import os |
| 37 | 37 |
|
| ... | ... | |
| 98 | 98 |
requesters_address = request.META['HTTP_X_FORWARDED_FOR'] |
| 99 | 99 |
mail_body = render_to_string("rule_add_mail.txt",
|
| 100 | 100 |
{"route": route, "address": requesters_address})
|
| 101 |
send_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s creation request submitted by %s" %(route.name, route.applier.username), |
|
| 102 |
mail_body, settings.SERVER_EMAIL, |
|
| 103 |
get_peer_techc_mails(route.applier), fail_silently=True) |
|
| 101 |
user_mail = "%s" %route.applier.email |
|
| 102 |
user_mail = user_mail.split(';')
|
|
| 103 |
send_new_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s creation request submitted by %s" %(route.name, route.applier.username), |
|
| 104 |
mail_body, settings.SERVER_EMAIL, user_mail, |
|
| 105 |
get_peer_techc_mails(route.applier)) |
|
| 104 | 106 |
d = { 'clientip' : "%s"%requesters_address, 'user' : route.applier.username }
|
| 105 | 107 |
logger.info(mail_body, extra=d) |
| 106 | 108 |
return HttpResponseRedirect(reverse("group-routes"))
|
| ... | ... | |
| 147 | 149 |
requesters_address = request.META['HTTP_X_FORWARDED_FOR'] |
| 148 | 150 |
mail_body = render_to_string("rule_edit_mail.txt",
|
| 149 | 151 |
{"route": route, "address": requesters_address})
|
| 150 |
send_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s edit request submitted by %s" %(route.name, route.applier.username), |
|
| 151 |
mail_body, settings.SERVER_EMAIL, |
|
| 152 |
get_peer_techc_mails(route.applier), fail_silently=True) |
|
| 152 |
user_mail = "%s" %route.applier.email |
|
| 153 |
user_mail = user_mail.split(';')
|
|
| 154 |
send_new_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s edit request submitted by %s" %(route.name, route.applier.username), |
|
| 155 |
mail_body, settings.SERVER_EMAIL, user_mail, |
|
| 156 |
get_peer_techc_mails(route.applier)) |
|
| 153 | 157 |
d = { 'clientip' : requesters_address, 'user' : route.applier.username }
|
| 154 | 158 |
logger.info(mail_body, extra=d) |
| 155 | 159 |
return HttpResponseRedirect(reverse("group-routes"))
|
| ... | ... | |
| 180 | 184 |
requesters_address = request.META['HTTP_X_FORWARDED_FOR'] |
| 181 | 185 |
mail_body = render_to_string("rule_delete_mail.txt",
|
| 182 | 186 |
{"route": route, "address": requesters_address})
|
| 183 |
send_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s removal request submitted by %s" %(route.name, route.applier.username), |
|
| 184 |
mail_body, settings.SERVER_EMAIL, |
|
| 185 |
get_peer_techc_mails(route.applier), fail_silently=True) |
|
| 187 |
user_mail = "%s" %route.applier.email |
|
| 188 |
user_mail = user_mail.split(';')
|
|
| 189 |
send_new_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s removal request submitted by %s" %(route.name, route.applier.username), |
|
| 190 |
mail_body, settings.SERVER_EMAIL, user_mail, |
|
| 191 |
get_peer_techc_mails(route.applier)) |
|
| 186 | 192 |
d = { 'clientip' : requesters_address, 'user' : route.applier.username }
|
| 187 | 193 |
logger.info(mail_body, extra=d) |
| 188 | 194 |
html = "<html><body>Done</body></html>" |
| ... | ... | |
| 317 | 323 |
techmails_list = techmails.split(';')
|
| 318 | 324 |
if settings.NOTIFY_ADMIN_MAILS: |
| 319 | 325 |
additional_mail = settings.NOTIFY_ADMIN_MAILS |
| 320 |
mail.extend(user_mail) |
|
| 326 |
# mail.extend(user_mail)
|
|
| 321 | 327 |
mail.extend(additional_mail) |
| 322 | 328 |
mail.extend(techmails_list) |
| 323 | 329 |
return mail |
| 330 |
|
|
| 331 |
|
|
| 332 |
def send_new_mail(subject, message, from_email, recipient_list, bcc_list): |
|
| 333 |
return EmailMessage(subject, message, from_email, recipient_list, bcc_list).send() |
|
| 334 |
|
|
Also available in: Unified diff