From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 15 Sep 2010 22:27:49 +0000 (-0400)
Subject: Added waldo filtering to send multipart or plaintext messages based on the template... 
X-Git-Tag: philo-0.9~32^2~5
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/ca9342a54be98582d23c0a4e179342efa1005bfc?ds=sidebyside;hp=--cc

Added waldo filtering to send multipart or plaintext messages based on the template mimetype. Tweaked Template model to actually default to text/html instead of just saying it.
---

ca9342a54be98582d23c0a4e179342efa1005bfc
diff --git a/contrib/waldo/models.py b/contrib/waldo/models.py
index 65cba9e..efb6504 100644
--- a/contrib/waldo/models.py
+++ b/contrib/waldo/models.py
@@ -6,11 +6,12 @@ from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, Passwo
 from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator as password_token_generator
 from django.contrib.sites.models import Site
-from django.core.mail import send_mail
+from django.core.mail import EmailMultiAlternatives, send_mail
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
+from django.template.defaultfilters import striptags
 from django.utils.http import int_to_base36, base36_to_int
 from django.utils.translation import ugettext_lazy, ugettext as _
 from django.views.decorators.cache import never_cache
@@ -175,9 +176,15 @@ class LoginMultiView(MultiView):
 		return inner
 	
 	def send_confirmation_email(self, subject, email, page, extra_context):
-		message = page.render_to_string(extra_context=extra_context)
+		text_content = page.render_to_string(extra_context=extra_context)
 		from_email = 'noreply@%s' % Site.objects.get_current().domain
-		send_mail(subject, message, from_email, [email])
+		
+		if page.template.mimetype == 'text/html':
+			msg = EmailMultiAlternatives(subject, striptags(text_content), from_email, [email])
+			msg.attach_alternative(text_content, 'text/html')
+			msg.send()
+		else:
+			send_mail(subject, text_content, from_email, [email])
 	
 	def password_reset(self, request, node=None, extra_context=None, token_generator=password_token_generator):
 		if request.user.is_authenticated():
diff --git a/models/pages.py b/models/pages.py
index 7b4415d..e000b1b 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -20,7 +20,7 @@ from philo.signals import page_about_to_render_to_string, page_finished_renderin
 class Template(TreeModel):
 	name = models.CharField(max_length=255)
 	documentation = models.TextField(null=True, blank=True)
-	mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
+	mimetype = models.CharField(max_length=255, default=getattr(settings, 'DEFAULT_CONTENT_TYPE', 'text/html'))
 	code = models.TextField(verbose_name='django template code')
 	
 	@property