added simple tag moderation via email and edited the changelog

2 files changed, 23 insertions, 2 deletions

diff --git a/askbot/mail/__init__.py b/askbot/mail/__init__.py
index 7ff8a2d3..1c32f14d 100644
--- a/askbot/mail/__init__.py
+++ b/askbot/mail/__init__.py
@@ -122,7 +122,9 @@ def send_mail(
 def mail_moderators(
             subject_line = '',
             body_text = '',
-            raise_on_failure = False):
+            raise_on_failure = False,
+            headers = None
+        ):
     """sends email to forum moderators and admins
     """
     from django.db.models import Q
@@ -139,7 +141,15 @@ def mail_moderators(
         from_email = django_settings.DEFAULT_FROM_EMAIL
 
     try:
-        mail.send_mail(subject_line, body_text, from_email, recipient_list)
+        msg = mail.EmailMessage(
+                        subject_line, 
+                        body_text, 
+                        from_email,
+                        recipient_list,
+                        headers = headers or {}
+                    )
+        msg.content_subtype = 'html'
+        msg.send()
     except smtplib.SMTPException, error:
         logging.critical(unicode(error))
         if raise_on_failure == True:
diff --git a/askbot/mail/messages.py b/askbot/mail/messages.py
index 24091971..3ab3ff2f 100644
--- a/askbot/mail/messages.py
+++ b/askbot/mail/messages.py
@@ -32,6 +32,17 @@ def ask_for_signature(user, footer_code = None):
         'footer_code': footer_code
     }
 
+@message(template = 'email/notify_admins_about_new_tags.html')
+def notify_admins_about_new_tags(
+    tags = None, thread = None, user = None
+):
+    thread_url = thread.get_absolute_url()
+    return {
+        'thread_url': html_utils.site_url(thread_url),
+        'tags': tags,
+        'user': user
+    }
+
 @message(template = 'email/insufficient_rep_to_post_by_email.html')
 def insufficient_reputation(user):
     """tells user that he does not have