Merge branch 'master' into haystack

Luan
2 parents 139dbed9 869bf1c1
Showing 21 changed files with 849 additions and 37 deletions Show diff stats
src/accounts/auth.py
src/accounts/forms.py
src/accounts/management/__init__.py
src/accounts/management/commands/__init__.py
src/accounts/management/commands/delete_invalid.py
src/accounts/templates/accounts/user_detail.html
src/accounts/templates/accounts/user_update_form.html
src/accounts/views.py
src/colab/custom_settings.py
src/static/css/screen.css
src/super_archives/admin.py
src/super_archives/migrations/0014_auto__chg_field_emailaddressvalidation_validation_key.py
src/super_archives/migrations/0015_auto__chg_field_emailaddress_user.py
src/super_archives/migrations/0016_auto__add_unique_emailaddressvalidation_user_address.py
src/super_archives/models.py
src/super_archives/templates/superarchives/emails/email_verification.txt
src/super_archives/templates/superarchives/tags/display_message.html
src/super_archives/templatetags/superarchives.py
src/super_archives/urls.py
src/super_archives/utils.py
@@ -4,6 +4,3 @@ from django_browserid.auth import BrowserIDBackend
 class ColabBrowserIDBackend(BrowserIDBackend):
     def filter_users_by_email(self, email):
         return self.User.objects.filter(emails__address=email)
-
-    def authenticate(self, *args, **kw):
-        return super(ColabBrowserIDBackend, self).authenticate(*args, **kw)
@@ -36,7 +36,7 @@ class UserCreationForm(UserForm):
 class UserUpdateForm(UserForm):
     class Meta:
         model = User
-        fields = ('username', 'first_name', 'last_name', 'email',
+        fields = ('username', 'first_name', 'last_name',
                   'institution', 'role', 'twitter', 'facebook',
                   'google_talk', 'webpage')
@@ -0,0 +1,42 @@
+
+
+from django.db.models import F
+from django.utils import timezone
+from django.utils.translation import ugettext as _
+from django.core.management.base import BaseCommand, CommandError
+
+
+from ...models import User
+
+
+class Command(BaseCommand):
+    """Delete user accounts that have never logged in.
+
+    Delete from database user accounts that have never logged in
+    and are at least 24h older.
+
+    """
+
+    help = __doc__
+
+    def handle(self, *args, **kwargs):
+        seconds = timezone.timedelta(seconds=1)
+        now = timezone.now()
+        one_day_ago = timezone.timedelta(days=1)
+
+        # Query for users that have NEVER logged in
+        #
+        # By default django sets the last_login as auto_now and then
+        #   last_login is pretty much the same than date_joined
+        #   (instead of null as I expected). Because of that we query
+        #   for users which last_login is between date_joined - N and
+        #   date_joined + N, where N is a small constant in seconds.
+        users = User.objects.filter(last_login__gt=(F('date_joined') - seconds),
+                                    last_login__lt=(F('date_joined') + seconds),
+                                    date_joined__lt=now-one_day_ago)
+        count = 0
+        for user in users:
+            count += 1
+            user.delete()
+
+        print _(u'%(count)s users deleted.') % {'count': count}
@@ -19,11 +19,19 @@
         <em>{{ user_.username }}</em>
       </h1>
-      {% ifequal request.user user_ %}
-        <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "update your profile"|title %}</a>
-      {% endifequal %}
+      {% if request.user == user_ or request.user.is_superuser %}
+        <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "edit profile"|title %}</a>
+      {% endif %}
       <div class="divider"></div>
+      {% if request.user.is_active %}
+        <ul class="unstyled-list">
+        {% for email in user_.emails.iterator %}
+          <li><span class="icon-envelope icon-fixed-width"></span> {{ email.address }}</li>
+        {% endfor %}
+        </ul>
+        <div class="divider"></div>
+      {% endif %}
       <ul class="unstyled-list">
         {% if user_.institution or user_.role %}
 {% extends "base.html" %}
 {% load i18n gravatar %}
+{% block head_js %}
+<script>
+$(function() {
+  $('#add-email').on('click', function(event) {
+    $.ajax({
+      url: "{% url 'archive_email_view' %}",
+      type: 'post',
+      data: { email: $('#new_email').val() },
+      beforeSend: function(xhr, settings) {
+        xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
+      }
+    }).done(function() {
+      location.reload();
+    });
+
+    event.preventDefault();
+  });
+
+  $('#new_email').on('keypress', function(event) {
+    if (event.which == 13) {
+      event.preventDefault();
+      $('#add-email').trigger('click');
+    }
+  });
+
+  $('.delete-email').on('click', function(event) {
+    var $email_block = $(event.target).parent().parent();
+    $.ajax({
+      url: "{% url 'archive_email_view' %}",
+      type: 'delete',
+      data: { email: $('.email-address', $email_block).text() },
+      context: $email_block[0],
+      beforeSend: function(xhr, settings) {
+        xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
+      }
+    }).done(function() {
+        $(this).remove();
+    });
+
+    event.preventDefault();
+  });
+
+  $('.verify-email').on('click', function(event) {
+    var $email_block = $(event.target).parent().parent();
+    $.ajax({
+      url: "{% url 'archive_email_validation_view' %}",
+      type: 'post',
+      data: { email: $('.email-address', $email_block).text() },
+      context: $email_block[0],
+      beforeSend: function(xhr, settings) {
+        xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
+      }
+    }).done(function() {
+      var email = $('.email-address', $(this)).text();
+      var msg = '{% trans "We sent a verification email to " %}' + email + '. ' +
+                '{% trans "Please follow the instructions in it." %}';
+      $('#alert-message').text(msg);
+      $('#alert-js').removeClass('alert-warning').addClass('alert-success');
+      $('#alert-js').show();
+      window.scroll(0, 0);
+    });
+
+    event.preventDefault();
+  });
+
+  $('.set-primary').on('click', function(event) {
+    var $email_block = $(event.target).parent().parent();
+    $.ajax({
+      url: "{% url 'archive_email_view' %}",
+      type: 'update',
+      data: { email: $('.email-address', $email_block).text() },
+      beforeSend: function(xhr, settings) {
+        xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
+      }
+    }).done(function() {
+      location.reload();
+    });
+
+    event.preventDefault();
+  });
+
+});
+</script>
+{% endblock %}
+
+
 {% block main-content %}
   <form method="post">
     {% csrf_token %}
     <div class="col-lg-12">
       <a href="https://gravatar.com" target="_blank">
-        {% gravatar request.user.email 50 %}
+        {% gravatar user_.email 50 %}
         {% trans "Change your avatar at Gravatar.com" %}
       </a>
     </div>
     <br>
     <div class="row">
-      {% for field in form %}
-      <div class="col-lg-4 col-md-6 col-sm-12 col-xm-12">
-        <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
-          <label for="{{ field.name }}" class="control-label">
-            {{ field.label }}
-          </label>
-          {{ field }}
-          {{ field.errors }}
+      <div class="col-lg-8 col-md-7 col-sm-12 col-xm-12">
+        {% for field in form %}
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xm-12">
+          <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
+            <label for="{{ field.name }}" class="control-label">
+              {{ field.label }}
+            </label>
+            {{ field }}
+            {{ field.errors }}
+          </div>
         </div>
+        {% endfor %}
       </div>
-      {% endfor %}
-    </div>
+      <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Emails" %}</h3>
+          </div>
+          <div class="panel-body">
+            <ul class="unstyled-list emails">
+            {% for email in user_.emails.iterator %}
+              <li>
+                {% gravatar user_.email 30 %}
+                <span class="email-address">{{ email.address }}</span>
+                {% if email.address == user_.email %}
+                  <span class="label label-success">{% trans "Primary" %}</span>
+                {% else %}
+                  <div class="text-right">
+                    <button class="btn btn-default set-primary">{% trans "Set as Primary" %}</button>
+                    <button class="btn btn-danger delete-email">{% trans "Delete" %}</button>
+                  </div>
+                {% endif %}
+                <hr />
+              </li>
+            {% endfor %}
+            {% for email in user_.emails_not_validated.iterator %}
+              <li>
+                {% gravatar user_.email 30 %}
+                <span class="email-address">{{ email.address }}</span>
+                <div class="text-right">
+                  <button class="btn btn-default verify-email"><span class="icon-warning-sign"></span> {% trans "Verify" %}</button>
+                  <button class="btn btn-danger delete-email">{% trans "Delete" %}</button>
+                </div>
+                <hr />
+              </li>
+            {% endfor %}
+            </ul>
+            <div class="form-group">
+              <label for="new_email">{% trans "Add another email address:" %}</label>
+              <input id="new_email" name="new_email" class="form-control" autocomplete="off" />
+            </div>
+            <button class="btn btn-primary pull-right" id="add-email">{% trans "Add" %}</button>
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="row">
       <div class="submit">
         <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
@@ -8,6 +8,7 @@ from django.views.generic import DetailView, UpdateView
 from django.utils.translation import ugettext as _
 from django.shortcuts import render, redirect
 from django.core.urlresolvers import reverse
+from django.core.exceptions import PermissionDenied
 from colab.deprecated import solrutils
 from colab.deprecated import signup as signup_
@@ -30,7 +31,12 @@ class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):
     def get_success_url(self):
         return reverse('user_profile', kwargs={'username': self.object.username})
+    def get_object(self, *args, **kwargs):
+        obj = super(UserProfileUpdateView, self).get_object(*args, **kwargs)
+        if self.request.user != obj and not self.request.user.is_superuser:
+            raise PermissionDenied
+        return obj
 class UserProfileDetailView(UserProfileBaseMixin, DetailView):
     template_name = 'accounts/user_detail.html'
@@ -134,8 +134,8 @@ LOGGING = {
     }
 }
-SERVER_EMAIL = '"Colab Interlegis" <noreply@interlegis.leg.br>'
-EMAIL_HOST_USER = SERVER_EMAIL
+COLAB_FROM_ADDRESS = '"Colab Interlegis" <noreply@interlegis.leg.br>'
+SERVER_EMAIL = EMAIL_HOST_USER = COLAB_FROM_ADDRESS
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
@@ -209,6 +209,7 @@ FEEDZILLA_SITE_DESCRIPTION = gettext(u&#39;Colab blog aggregator&#39;)
 ### BrowserID / Persona
 SITE_URL = 'https://colab.interlegis.leg.br'
+LOGIN_URL = '/'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/'
 LOGOUT_REDIRECT_URL = '/'
@@ -3,6 +3,10 @@ body {
     padding-top: 57px;
 }
+li hr {
+    margin: 10px 0;
+}
+
 /* Header */
 #header-searchbox {
@@ -348,3 +352,20 @@ ul.unstyled-list .glyphicon-chevron-right {
 }
 /* end Feedzilla */
+
+/* user profile update */
+
+.btn.delete-email:not(:hover) {
+    background-color: #fff;
+    color: #D9534F;
+}
+
+.btn .icon-warning-sign {
+    color: #F0AD4E;
+}
+
+ul.emails {
+    margin: 0;
+}
+
+/* end user profile update */
 from django.contrib import admin
-from .models import Message, Thread
+from .models import Message, Thread, EmailAddress
+
+
+class EmailAddressAdmin(admin.ModelAdmin):
+    search_fields = (
+        'address',
+        'user__username',
+        'user__first_name',
+        'user__last_name',
+    )
 class MessageAdmin(admin.ModelAdmin):
     list_filter = ('spam', 'thread__mailinglist', 'received_time', )
@@ -50,4 +59,5 @@ class ThreadAdmin(admin.ModelAdmin):
 admin.site.register(Thread, ThreadAdmin)
 admin.site.register(Message, MessageAdmin)
+admin.site.register(EmailAddress, EmailAddressAdmin)
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'EmailAddressValidation.validation_key'
+        db.alter_column(u'super_archives_emailaddressvalidation', 'validation_key', self.gf('django.db.models.fields.CharField')(max_length=32, null=True))
+
+    def backwards(self, orm):
+
+        # Changing field 'EmailAddressValidation.validation_key'
+        db.alter_column(u'super_archives_emailaddressvalidation', 'validation_key', self.gf('django.db.models.fields.CharField')(max_length=32))
+
+    models = {
+        u'accounts.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'super_archives.emailaddress': {
+            'Meta': {'object_name': 'EmailAddress'},
+            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
+            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['accounts.User']"})
+        },
+        u'super_archives.emailaddressvalidation': {
+            'Meta': {'object_name': 'EmailAddressValidation'},
+            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
+            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'30a2065c72c1402986a11e7c5369f5a5'", 'max_length': '32', 'null': 'True'})
+        },
+        u'super_archives.mailinglist': {
+            'Meta': {'object_name': 'MailingList'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
+        },
+        u'super_archives.mailinglistmembership': {
+            'Meta': {'object_name': 'MailingListMembership'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
+        },
+        u'super_archives.message': {
+            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
+            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
+        },
+        u'super_archives.messagemetadata': {
+            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
+            'Meta': {'object_name': 'MessageMetadata'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        u'super_archives.pagehit': {
+            'Meta': {'object_name': 'PageHit'},
+            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
+        },
+        u'super_archives.thread': {
+            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        u'super_archives.vote': {
+            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
+        }
+    }
+
+    complete_apps = ['super_archives']
 \ No newline at end of file
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'EmailAddress.user'
+        db.alter_column(u'super_archives_emailaddress', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, on_delete=models.SET_NULL, to=orm['accounts.User']))
+
+    def backwards(self, orm):
+
+        # Changing field 'EmailAddress.user'
+        db.alter_column(u'super_archives_emailaddress', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['accounts.User']))
+
+    models = {
+        u'accounts.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'super_archives.emailaddress': {
+            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
+            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
+            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
+        },
+        u'super_archives.emailaddressvalidation': {
+            'Meta': {'object_name': 'EmailAddressValidation'},
+            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
+            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'a9cfbe23d1be41e4beeafa7790325e26'", 'max_length': '32', 'null': 'True'})
+        },
+        u'super_archives.mailinglist': {
+            'Meta': {'object_name': 'MailingList'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
+        },
+        u'super_archives.mailinglistmembership': {
+            'Meta': {'object_name': 'MailingListMembership'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
+        },
+        u'super_archives.message': {
+            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
+            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
+        },
+        u'super_archives.messagemetadata': {
+            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
+            'Meta': {'object_name': 'MessageMetadata'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        u'super_archives.pagehit': {
+            'Meta': {'object_name': 'PageHit'},
+            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
+        },
+        u'super_archives.thread': {
+            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        u'super_archives.vote': {
+            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
+        }
+    }
+
+    complete_apps = ['super_archives']
 \ No newline at end of file
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding unique constraint on 'EmailAddressValidation', fields ['user', 'address']
+        db.create_unique(u'super_archives_emailaddressvalidation', ['user_id', 'address'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'EmailAddressValidation', fields ['user', 'address']
+        db.delete_unique(u'super_archives_emailaddressvalidation', ['user_id', 'address'])
+
+
+    models = {
+        u'accounts.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'super_archives.emailaddress': {
+            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
+            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
+            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
+        },
+        u'super_archives.emailaddressvalidation': {
+            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
+            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
+            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'cfda46852e7e4e4a9e34a57c3d3b2330'", 'max_length': '32', 'null': 'True'})
+        },
+        u'super_archives.mailinglist': {
+            'Meta': {'object_name': 'MailingList'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
+        },
+        u'super_archives.mailinglistmembership': {
+            'Meta': {'object_name': 'MailingListMembership'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
+        },
+        u'super_archives.message': {
+            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
+            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
+        },
+        u'super_archives.messagemetadata': {
+            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
+            'Meta': {'object_name': 'MessageMetadata'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        u'super_archives.pagehit': {
+            'Meta': {'object_name': 'PageHit'},
+            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
+        },
+        u'super_archives.thread': {
+            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        u'super_archives.vote': {
+            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
+        }
+    }
+
+    complete_apps = ['super_archives']
 \ No newline at end of file
@@ -30,17 +30,24 @@ class EmailAddressValidation(models.Model):
     address = models.EmailField(unique=True)
     user = models.ForeignKey(User, null=True,
                              related_name='emails_not_validated')
-    validation_key = models.CharField(max_length=32,
+    validation_key = models.CharField(max_length=32, null=True,
                                       default=lambda: uuid4().hex)
     created = models.DateTimeField(auto_now_add=True)
+    class Meta:
+        unique_together = ('user', 'address')
+
 class EmailAddress(models.Model):
-    user = models.ForeignKey(User, null=True, related_name='emails')
+    user = models.ForeignKey(User, null=True, related_name='emails',
+                             on_delete=models.SET_NULL)
     address = models.EmailField(unique=True)
     real_name = models.CharField(max_length=64, blank=True, db_index=True)
     md5 = models.CharField(max_length=32, null=True)
+    class Meta:
+        ordering = ('id', )
+
     def save(self, *args, **kwargs):
         self.md5 = md5(self.address).hexdigest()
         super(EmailAddress, self).save(*args, **kwargs)
@@ -48,7 +55,7 @@ class EmailAddress(models.Model):
     def get_full_name(self):
         if self.user and self.user.get_full_name():
             return self.user.get_full_name()
-        elif self.real_name:
+        else:
             return self.real_name
     def get_full_name_or_anonymous(self):
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% blocktrans with fullname=user.get_full_name|title username=user.username|lower %}Hey, we want to verify that you are indeed "{{ fullname }} ({{ username }})".  If that's the case, please follow the link below:{% endblocktrans %}
+
+{{ SITE_URL }}{% url 'archive_email_view' key %}
+
+{% blocktrans with username=user.username %}If you're not {{ username }} or didn't request verification you can ignore this email.{% endblocktrans %}
@@ -4,6 +4,6 @@
 {% for message, class in messages %}
   {% if class == 'reply' %}
     <button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>
-    <pre style="display: none; color: #707";>{% else %}<pre>{% endif %}{{ message }}</pre>
+    <div style="display: none; color: #707";>{% else %}<div>{% endif %}{{ message|safe|linebreaksbr }}</div>
 {% endfor %}
 {% endcache %}
@@ -14,15 +14,27 @@ TEMPLATE_PATH = &#39;superarchives/tags/&#39;
 EXTENDED_PUNCTUATION = '!"#$%&\'()*+,-./:;=?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
 RE_WRAPPED_BY_HTML = re.compile(r'^<[a-z]+[^>]*>.*</[a-z]+[^>]*>$',
                                 re.MULTILINE|re.IGNORECASE|re.DOTALL)
+RE_LINKS = re.compile(r'(?P<link>https?://[^ \t\r\n\<]+)')
+
+
+def find_links(block):
+    links = RE_LINKS.finditer(block)
+
+    block, n = RE_LINKS.subn(r'<a target="_blank" href="\g<link>">\g<link></a>',
+                             block)
+
+    return block
 def join(block):
     block_txt = u''.join(block)
     if RE_WRAPPED_BY_HTML.match(block_txt.strip()):
-        return html2text(block_txt)
+        block = html2text(block_txt)
+    else:
+        block = block_txt
-    return block_txt
+    return find_links(block)
 def is_reply(line, message, thread):
     clean_line = line.strip()
@@ -41,8 +53,7 @@ def is_reply(line, message, thread):
     return False
-@register.inclusion_tag(TEMPLATE_PATH + 'display_message.html',
-                        takes_context=False)
+@register.inclusion_tag(TEMPLATE_PATH + 'display_message.html')
 def display_message(email, thread):
     message = email.body
     messages = []
 from django.conf.urls import patterns, include, url
+from .views import EmailView, EmailValidationView
+
+
 urlpatterns = patterns('super_archives.views',
 #    url(r'thread/(?P<thread>\d+)/$', 'thread', name='thread'),
     url(r'thread/(?P<mailinglist>[-\w]+)/(?P<thread_token>[-\w]+)$', 'thread', 
         name="thread_view"),
-    url(r'thread/$', 'list_messages', name='thread_list')
+    url(r'thread/$', 'list_messages', name='thread_list'),
+    url(r'manage/email/validate/?$', EmailValidationView.as_view(),
+                                     name="archive_email_validation_view"),
+    url(r'manage/email/(?P<key>[0-9a-z]{32})?', EmailView.as_view(),
+                                                name="archive_email_view"),
 )
@@ -0,0 +1,19 @@
+
+from django.core import mail
+from django.conf import settings
+from django.template import Context, loader
+from django.utils.translation import ugettext as _
+
+
+def colab_send_email(subject, message, to):
+    from_email = settings.COLAB_FROM_ADDRESS
+    return mail.send_mail(subject, message, from_email, [to])
+
+
+def send_verification_email(to, user, validation_key):
+    subject = _('Please verify your email ') + u'{}'.format(to)
+    msg_tmpl = loader.get_template('superarchives/emails/email_verification.txt')
+    message = msg_tmpl.render(Context({'to': to, 'user': user,
+                                       'key': validation_key,
+                                       'SITE_URL': settings.SITE_URL}))
+    return colab_send_email(subject, message, to)
 # -*- coding: utf-8 -*-
-import queries
+import smtplib
-from django.http import Http404
-from django.template import RequestContext
+from django import http
+from django.contrib import messages
+from django.db import IntegrityError
+from django.views.generic import View
 from django.core.paginator import Paginator
+from django.utils.translation import ugettext as _
 from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import render, get_list_or_404
+from django.utils.decorators import method_decorator
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render, redirect
-from .models import MailingList, Thread
+from . import queries
+from .utils import send_verification_email
 from .decorators import count_hit
+from .models import MailingList, Thread, EmailAddress, EmailAddressValidation
 @count_hit
 def thread(request, mailinglist, thread_token):
     try:
-        first_message = queries.get_first_message_in_thread(mailinglist, 
+        first_message = queries.get_first_message_in_thread(mailinglist,
                                                             thread_token)
     except ObjectDoesNotExist:
-        raise Http404
+        raise http.Http404
     order_by = request.GET.get('order')
     if order_by == 'voted':
         msgs_query = queries.get_messages_by_voted()
@@ -80,3 +87,129 @@ def list_messages(request):
         'order_by': order_by,
     }
     return render(request, 'message-list.html', template_data)
+
+
+class EmailView(View):
+
+    http_method_names = [u'head', u'get', u'post', u'delete', u'update']
+
+    def get(self, request, key):
+        """Validate an email with the given key"""
+
+        try:
+            email_val = EmailAddressValidation.objects.get(validation_key=key,
+                                                           user__pk=request.user.pk)
+        except EmailAddressValidation.DoesNotExist:
+            messages.error(request, _('The email address you are trying to '
+                                      'verify either has already been verified '
+                                      'or does not exist.'))
+            return redirect('/')
+
+        try:
+            email = EmailAddress.objects.get(address=email_val.address)
+        except EmailAddress.DoesNotExist:
+            email = EmailAddress(address=email_val.address)
+
+        if email.user:
+            messages.error(request, _('The email address you are trying to '
+                                      'verify is already an active email '
+                                      'address.'))
+            email_val.delete()
+            return redirect('/')
+
+        email.user = email_val.user
+        email.save()
+        email_val.delete()
+
+        messages.success(request, _('Email address verified!'))
+        return redirect('user_profile', username=email_val.user.username)
+
+
+    @method_decorator(login_required)
+    def post(self, request, key):
+        """Create new email address that will wait for validation"""
+
+        email = request.POST.get('email')
+        if not email:
+            return http.HttpResponseBadRequest()
+
+        try:
+            EmailAddressValidation.objects.create(address=email,
+                                                  user=request.user)
+        except IntegrityError:
+            # 409 Conflict
+            #   duplicated entries
+            #   email exist and it's waiting for validation
+            return http.HttpResponse(status=409)
+
+        return http.HttpResponse(status=201)
+
+    @method_decorator(login_required)
+    def delete(self, request, key):
+        """Remove an email address, validated or not."""
+
+        request.DELETE = http.QueryDict(request.body)
+        email_addr = request.DELETE.get('email')
+
+        if not email_addr:
+            return http.HttpResponseBadRequest()
+
+        try:
+            email = EmailAddressValidation.objects.get(address=email_addr,
+                                                       user=request.user)
+        except EmailAddressValidation.DoesNotExist:
+            pass
+        else:
+            email.delete()
+            return http.HttpResponse(status=204)
+
+        try:
+            email = EmailAddress.objects.get(address=email_addr,
+                                             user=request.user)
+        except EmailAddress.DoesNotExist:
+            raise http.Http404
+
+        email.user = None
+        email.save()
+        return http.HttpResponse(status=204)
+
+    @method_decorator(login_required)
+    def update(self, request, key):
+        """Set an email address as primary address."""
+
+        request.UPDATE = http.QueryDict(request.body)
+
+        email_addr = request.UPDATE.get('email')
+        if not email_addr:
+            return http.HttpResponseBadRequest()
+
+        try:
+            email = EmailAddress.objects.get(address=email_addr,
+                                             user=request.user)
+        except EmailAddress.DoesNotExist:
+            raise http.Http404
+
+        request.user.email = email_addr
+        request.user.save()
+        return http.HttpResponse(status=204)
+
+
+class EmailValidationView(View):
+
+    http_method_names = [u'post']
+
+    def post(self, request):
+        email_addr = request.POST.get('email')
+        try:
+            email = EmailAddressValidation.objects.get(address=email_addr,
+                                                       user=request.user)
+        except http.DoesNotExist:
+            raise http.Http404
+
+        try:
+            send_verification_email(email_addr, request.user,
+                                    email.validation_key)
+        except smtplib.SMTPException:
+            return http.HttpResponseServerError()
+
+        return http.HttpResponse(status=204)
	@@ -4,6 +4,3 @@ from django_browserid.auth import BrowserIDBackend		@@ -4,6 +4,3 @@ from django_browserid.auth import BrowserIDBackend
4	class ColabBrowserIDBackend(BrowserIDBackend):	4	class ColabBrowserIDBackend(BrowserIDBackend):
5	def filter_users_by_email(self, email):	5	def filter_users_by_email(self, email):
6	return self.User.objects.filter(emails__address=email)	6	return self.User.objects.filter(emails__address=email)
7	-
8	- def authenticate(self, args, *kw):
9	- return super(ColabBrowserIDBackend, self).authenticate(args, *kw)
	@@ -36,7 +36,7 @@ class UserCreationForm(UserForm):		@@ -36,7 +36,7 @@ class UserCreationForm(UserForm):
36	class UserUpdateForm(UserForm):	36	class UserUpdateForm(UserForm):
37	class Meta:	37	class Meta:
38	model = User	38	model = User
39	- fields = ('username', 'first_name', 'last_name', 'email',	39	+ fields = ('username', 'first_name', 'last_name',
40	'institution', 'role', 'twitter', 'facebook',	40	'institution', 'role', 'twitter', 'facebook',
41	'google_talk', 'webpage')	41	'google_talk', 'webpage')
42		42
@@ -0,0 +1,42 @@		@@ -0,0 +1,42 @@
	1	+
	2	+
	3	+from django.db.models import F
	4	+from django.utils import timezone
	5	+from django.utils.translation import ugettext as _
	6	+from django.core.management.base import BaseCommand, CommandError
	7	+
	8	+
	9	+from ...models import User
	10	+
	11	+
	12	+class Command(BaseCommand):
	13	+ """Delete user accounts that have never logged in.
	14	+
	15	+ Delete from database user accounts that have never logged in
	16	+ and are at least 24h older.
	17	+
	18	+ """
	19	+
	20	+ help = __doc__
	21	+
	22	+ def handle(self, args, *kwargs):
	23	+ seconds = timezone.timedelta(seconds=1)
	24	+ now = timezone.now()
	25	+ one_day_ago = timezone.timedelta(days=1)
	26	+
	27	+ # Query for users that have NEVER logged in
	28	+ #
	29	+ # By default django sets the last_login as auto_now and then
	30	+ # last_login is pretty much the same than date_joined
	31	+ # (instead of null as I expected). Because of that we query
	32	+ # for users which last_login is between date_joined - N and
	33	+ # date_joined + N, where N is a small constant in seconds.
	34	+ users = User.objects.filter(last_login__gt=(F('date_joined') - seconds),
	35	+ last_login__lt=(F('date_joined') + seconds),
	36	+ date_joined__lt=now-one_day_ago)
	37	+ count = 0
	38	+ for user in users:
	39	+ count += 1
	40	+ user.delete()
	41	+
	42	+ print _(u'%(count)s users deleted.') % {'count': count}
1	{% extends "base.html" %}	1	{% extends "base.html" %}
2	{% load i18n gravatar %}	2	{% load i18n gravatar %}
3		3
		4	+{% block head_js %}
		5	+<script>
		6	+$(function() {
		7	+ $('#add-email').on('click', function(event) {
		8	+ $.ajax({
		9	+ url: "{% url 'archive_email_view' %}",
		10	+ type: 'post',
		11	+ data: { email: $('#new_email').val() },
		12	+ beforeSend: function(xhr, settings) {
		13	+ xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
		14	+ }
		15	+ }).done(function() {
		16	+ location.reload();
		17	+ });
		18	+
		19	+ event.preventDefault();
		20	+ });
		21	+
		22	+ $('#new_email').on('keypress', function(event) {
		23	+ if (event.which == 13) {
		24	+ event.preventDefault();
		25	+ $('#add-email').trigger('click');
		26	+ }
		27	+ });
		28	+
		29	+ $('.delete-email').on('click', function(event) {
		30	+ var $email_block = $(event.target).parent().parent();
		31	+ $.ajax({
		32	+ url: "{% url 'archive_email_view' %}",
		33	+ type: 'delete',
		34	+ data: { email: $('.email-address', $email_block).text() },
		35	+ context: $email_block[0],
		36	+ beforeSend: function(xhr, settings) {
		37	+ xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
		38	+ }
		39	+ }).done(function() {
		40	+ $(this).remove();
		41	+ });
		42	+
		43	+ event.preventDefault();
		44	+ });
		45	+
		46	+ $('.verify-email').on('click', function(event) {
		47	+ var $email_block = $(event.target).parent().parent();
		48	+ $.ajax({
		49	+ url: "{% url 'archive_email_validation_view' %}",
		50	+ type: 'post',
		51	+ data: { email: $('.email-address', $email_block).text() },
		52	+ context: $email_block[0],
		53	+ beforeSend: function(xhr, settings) {
		54	+ xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
		55	+ }
		56	+ }).done(function() {
		57	+ var email = $('.email-address', $(this)).text();
		58	+ var msg = '{% trans "We sent a verification email to " %}' + email + '. ' +
		59	+ '{% trans "Please follow the instructions in it." %}';
		60	+ $('#alert-message').text(msg);
		61	+ $('#alert-js').removeClass('alert-warning').addClass('alert-success');
		62	+ $('#alert-js').show();
		63	+ window.scroll(0, 0);
		64	+ });
		65	+
		66	+ event.preventDefault();
		67	+ });
		68	+
		69	+ $('.set-primary').on('click', function(event) {
		70	+ var $email_block = $(event.target).parent().parent();
		71	+ $.ajax({
		72	+ url: "{% url 'archive_email_view' %}",
		73	+ type: 'update',
		74	+ data: { email: $('.email-address', $email_block).text() },
		75	+ beforeSend: function(xhr, settings) {
		76	+ xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
		77	+ }
		78	+ }).done(function() {
		79	+ location.reload();
		80	+ });
		81	+
		82	+ event.preventDefault();
		83	+ });
		84	+
		85	+});
		86	+</script>
		87	+{% endblock %}
		88	+
		89	+
4	{% block main-content %}	90	{% block main-content %}
5	<form method="post">	91	<form method="post">
6	{% csrf_token %}	92	{% csrf_token %}
7		93
8	<div class="col-lg-12">	94	<div class="col-lg-12">
9	<a href="https://gravatar.com" target="_blank">	95	<a href="https://gravatar.com" target="_blank">
10	- {% gravatar request.user.email 50 %}	96	+ {% gravatar user_.email 50 %}
11	{% trans "Change your avatar at Gravatar.com" %}	97	{% trans "Change your avatar at Gravatar.com" %}
12	</a>	98	</a>
13	</div>	99	</div>
14	<br>	100	<br>
15		101
16	<div class="row">	102	<div class="row">
17	- {% for field in form %}
18	- <div class="col-lg-4 col-md-6 col-sm-12 col-xm-12">
19	- <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
20	- <label for="{{ field.name }}" class="control-label">
21	- {{ field.label }}
22	- </label>
23	- {{ field }}
24	- {{ field.errors }}	103	+ <div class="col-lg-8 col-md-7 col-sm-12 col-xm-12">
		104	+ {% for field in form %}
		105	+ <div class="col-lg-6 col-md-6 col-sm-12 col-xm-12">
		106	+ <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
		107	+ <label for="{{ field.name }}" class="control-label">
		108	+ {{ field.label }}
		109	+ </label>
		110	+ {{ field }}
		111	+ {{ field.errors }}
		112	+ </div>
25	</div>	113	</div>
		114	+ {% endfor %}
26	</div>	115	</div>
27	- {% endfor %}
28	- </div>
29		116
		117	+ <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
		118	+ <div class="panel panel-default">
		119	+ <div class="panel-heading">
		120	+ <h3 class="panel-title">{% trans "Emails" %}</h3>
		121	+ </div>
		122	+ <div class="panel-body">
		123	+ <ul class="unstyled-list emails">
		124	+ {% for email in user_.emails.iterator %}
		125	+ <li>
		126	+ {% gravatar user_.email 30 %}
		127	+ <span class="email-address">{{ email.address }}</span>
		128	+ {% if email.address == user_.email %}
		129	+ <span class="label label-success">{% trans "Primary" %}</span>
		130	+ {% else %}
		131	+ <div class="text-right">
		132	+ <button class="btn btn-default set-primary">{% trans "Set as Primary" %}</button>
		133	+ <button class="btn btn-danger delete-email">{% trans "Delete" %}</button>
		134	+ </div>
		135	+ {% endif %}
		136	+ <hr />
		137	+ </li>
		138	+ {% endfor %}
		139	+ {% for email in user_.emails_not_validated.iterator %}
		140	+ <li>
		141	+ {% gravatar user_.email 30 %}
		142	+ <span class="email-address">{{ email.address }}</span>
		143	+ <div class="text-right">
		144	+ <button class="btn btn-default verify-email"><span class="icon-warning-sign"></span> {% trans "Verify" %}</button>
		145	+ <button class="btn btn-danger delete-email">{% trans "Delete" %}</button>
		146	+ </div>
		147	+ <hr />
		148	+ </li>
		149	+ {% endfor %}
		150	+ </ul>
		151	+ <div class="form-group">
		152	+ <label for="new_email">{% trans "Add another email address:" %}</label>
		153	+ <input id="new_email" name="new_email" class="form-control" autocomplete="off" />
		154	+ </div>
		155	+ <button class="btn btn-primary pull-right" id="add-email">{% trans "Add" %}</button>
		156	+ </div>
		157	+ </div>
		158	+ </div>
		159	+ </div>
30	<div class="row">	160	<div class="row">
31	<div class="submit">	161	<div class="submit">
32	<button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>	162	<button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
	@@ -3,6 +3,10 @@ body {		@@ -3,6 +3,10 @@ body {
3	padding-top: 57px;	3	padding-top: 57px;
4	}	4	}
5		5
		6	+li hr {
		7	+ margin: 10px 0;
		8	+}
		9	+
6	/* Header */	10	/* Header */
7		11
8	#header-searchbox {	12	#header-searchbox {
	@@ -348,3 +352,20 @@ ul.unstyled-list .glyphicon-chevron-right {		@@ -348,3 +352,20 @@ ul.unstyled-list .glyphicon-chevron-right {
348	}	352	}
349		353
350	/* end Feedzilla */	354	/* end Feedzilla */
		355	+
		356	+/* user profile update */
		357	+
		358	+.btn.delete-email:not(:hover) {
		359	+ background-color: #fff;
		360	+ color: #D9534F;
		361	+}
		362	+
		363	+.btn .icon-warning-sign {
		364	+ color: #F0AD4E;
		365	+}
		366	+
		367	+ul.emails {
		368	+ margin: 0;
		369	+}
		370	+
		371	+/* end user profile update */
1		1
2	from django.contrib import admin	2	from django.contrib import admin
3	-from .models import Message, Thread	3	+from .models import Message, Thread, EmailAddress
		4	+
		5	+
		6	+class EmailAddressAdmin(admin.ModelAdmin):
		7	+ search_fields = (
		8	+ 'address',
		9	+ 'user__username',
		10	+ 'user__first_name',
		11	+ 'user__last_name',
		12	+ )
4		13
5	class MessageAdmin(admin.ModelAdmin):	14	class MessageAdmin(admin.ModelAdmin):
6	list_filter = ('spam', 'thread__mailinglist', 'received_time', )	15	list_filter = ('spam', 'thread__mailinglist', 'received_time', )
	@@ -50,4 +59,5 @@ class ThreadAdmin(admin.ModelAdmin):		@@ -50,4 +59,5 @@ class ThreadAdmin(admin.ModelAdmin):
50		59
51	admin.site.register(Thread, ThreadAdmin)	60	admin.site.register(Thread, ThreadAdmin)
52	admin.site.register(Message, MessageAdmin)	61	admin.site.register(Message, MessageAdmin)
		62	+admin.site.register(EmailAddress, EmailAddressAdmin)
53		63
	@@ -0,0 +1,138 @@		@@ -0,0 +1,138 @@
		1	+# -- coding: utf-8 --
		2	+import datetime
		3	+from south.db import db
		4	+from south.v2 import SchemaMigration
		5	+from django.db import models
		6	+
		7	+
		8	+class Migration(SchemaMigration):
		9	+
		10	+ def forwards(self, orm):
		11	+
		12	+ # Changing field 'EmailAddressValidation.validation_key'
		13	+ db.alter_column(u'super_archives_emailaddressvalidation', 'validation_key', self.gf('django.db.models.fields.CharField')(max_length=32, null=True))
		14	+
		15	+ def backwards(self, orm):
		16	+
		17	+ # Changing field 'EmailAddressValidation.validation_key'
		18	+ db.alter_column(u'super_archives_emailaddressvalidation', 'validation_key', self.gf('django.db.models.fields.CharField')(max_length=32))
		19	+
		20	+ models = {
		21	+ u'accounts.user': {
		22	+ 'Meta': {'object_name': 'User'},
		23	+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
		24	+ 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
		25	+ 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
		26	+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
		27	+ 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
		28	+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
		29	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		30	+ 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
		31	+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
		32	+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
		33	+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
		34	+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
		35	+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
		36	+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
		37	+ 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
		38	+ 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
		39	+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
		40	+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
		41	+ 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
		42	+ 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
		43	+ },
		44	+ u'auth.group': {
		45	+ 'Meta': {'object_name': 'Group'},
		46	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		47	+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
		48	+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
		49	+ },
		50	+ u'auth.permission': {
		51	+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
		52	+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
		53	+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
		54	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		55	+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
		56	+ },
		57	+ u'contenttypes.contenttype': {
		58	+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
		59	+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
		60	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		61	+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
		62	+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
		63	+ },
		64	+ u'super_archives.emailaddress': {
		65	+ 'Meta': {'object_name': 'EmailAddress'},
		66	+ 'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
		67	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		68	+ 'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
		69	+ 'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
		70	+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['accounts.User']"})
		71	+ },
		72	+ u'super_archives.emailaddressvalidation': {
		73	+ 'Meta': {'object_name': 'EmailAddressValidation'},
		74	+ 'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
		75	+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
		76	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		77	+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
		78	+ 'validation_key': ('django.db.models.fields.CharField', [], {'default': "'30a2065c72c1402986a11e7c5369f5a5'", 'max_length': '32', 'null': 'True'})
		79	+ },
		80	+ u'super_archives.mailinglist': {
		81	+ 'Meta': {'object_name': 'MailingList'},
		82	+ 'description': ('django.db.models.fields.TextField', [], {}),
		83	+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
		84	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		85	+ 'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
		86	+ 'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
		87	+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
		88	+ },
		89	+ u'super_archives.mailinglistmembership': {
		90	+ 'Meta': {'object_name': 'MailingListMembership'},
		91	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		92	+ 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
		93	+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
		94	+ },
		95	+ u'super_archives.message': {
		96	+ 'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
		97	+ 'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
		98	+ 'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
		99	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		100	+ 'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
		101	+ 'received_time': ('django.db.models.fields.DateTimeField', [], {}),
		102	+ 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
		103	+ 'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
		104	+ 'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
		105	+ 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
		106	+ },
		107	+ u'super_archives.messagemetadata': {
		108	+ 'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
		109	+ 'Meta': {'object_name': 'MessageMetadata'},
		110	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		111	+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
		112	+ 'value': ('django.db.models.fields.TextField', [], {})
		113	+ },
		114	+ u'super_archives.pagehit': {
		115	+ 'Meta': {'object_name': 'PageHit'},
		116	+ 'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
		117	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		118	+ 'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
		119	+ },
		120	+ u'super_archives.thread': {
		121	+ 'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
		122	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		123	+ 'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
		124	+ 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
		125	+ 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
		126	+ 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
		127	+ 'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
		128	+ },
		129	+ u'super_archives.vote': {
		130	+ 'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
		131	+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
		132	+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
		133	+ 'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
		134	+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
		135	+ }
		136	+ }
		137	+
		138	+ complete_apps = ['super_archives']
0	\ No newline at end of file	139	\ No newline at end of file
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+{% load i18n %}
	2	+{% blocktrans with fullname=user.get_full_name\|title username=user.username\|lower %}Hey, we want to verify that you are indeed "{{ fullname }} ({{ username }})". If that's the case, please follow the link below:{% endblocktrans %}
	3	+
	4	+{{ SITE_URL }}{% url 'archive_email_view' key %}
	5	+
	6	+{% blocktrans with username=user.username %}If you're not {{ username }} or didn't request verification you can ignore this email.{% endblocktrans %}
	@@ -4,6 +4,6 @@		@@ -4,6 +4,6 @@
4	{% for message, class in messages %}	4	{% for message, class in messages %}
5	{% if class == 'reply' %}	5	{% if class == 'reply' %}
6	<button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>	6	<button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>
7	- <pre style="display: none; color: #707";>{% else %}<pre>{% endif %}{{ message }}</pre>	7	+ <div style="display: none; color: #707";>{% else %}<div>{% endif %}{{ message\|safe\|linebreaksbr }}</div>
8	{% endfor %}	8	{% endfor %}
9	{% endcache %}	9	{% endcache %}
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+
	2	+from django.core import mail
	3	+from django.conf import settings
	4	+from django.template import Context, loader
	5	+from django.utils.translation import ugettext as _
	6	+
	7	+
	8	+def colab_send_email(subject, message, to):
	9	+ from_email = settings.COLAB_FROM_ADDRESS
	10	+ return mail.send_mail(subject, message, from_email, [to])
	11	+
	12	+
	13	+def send_verification_email(to, user, validation_key):
	14	+ subject = _('Please verify your email ') + u'{}'.format(to)
	15	+ msg_tmpl = loader.get_template('superarchives/emails/email_verification.txt')
	16	+ message = msg_tmpl.render(Context({'to': to, 'user': user,
	17	+ 'key': validation_key,
	18	+ 'SITE_URL': settings.SITE_URL}))
	19	+ return colab_send_email(subject, message, to)