From c14775c638735fd719a97f53cb119ccea37f2ba4 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 1 Aug 2013 12:19:12 +0200
Subject: Use the user_id as key to avoid exposing the email address

---
 hyperkitty/templates/messages/message.html    | 14 +++++++++-----
 hyperkitty/templates/user_public_profile.html |  8 ++------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 7140d75..23fa458 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -27,17 +27,21 @@
             {% gravatar email.sender_email 40 %}
         </div>
         <div class="email-author inline-block">
-            <span class="name"><a
-                href="{% url 'public_user_profile' email=email.sender_email %}"
-                title="See {{ email.sender_name|escapeemail|escape }}'s profile"
-                >{{email.sender_name|escapeemail}}</a></span>
+            <span class="name">
+                {% if email.user_id %}
+                <a href="{% url 'public_user_profile' user_id=email.user_id %}"
+                   title="See {{ email.sender_name|escapeemail|escape }}'s profile"
+                   >{{email.sender_name|escapeemail}}</a>
+                {% else %}
+                   {{email.sender_name|escapeemail}}
+                {% endif %}
+            </span>
             <br />
             <span class="messagelink">
                 (<a href="{% url 'message_index' mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %}"
                     title="{{ email.subject }}">permalink</a>)
             </span>
             {% if use_mockups %}
-            <br />
             <span class="rank">
                 Rank 8
             </span>
diff --git a/hyperkitty/templates/user_public_profile.html b/hyperkitty/templates/user_public_profile.html
index b62002d..0e4f7af 100644
--- a/hyperkitty/templates/user_public_profile.html
+++ b/hyperkitty/templates/user_public_profile.html
@@ -6,14 +6,14 @@
 
 
 {% block title %}
-{% trans 'User Profile' %} for {{ email }} - {{ app_name|title }}
+{% trans 'User Profile' %} for {{ fullname }} - {{ app_name|title }}
 {% endblock %}
 
 {% block content %}
 
 <div id="user-profile">
 
-    <h1>User profile <small>for {{ email }}</small></h1>
+    <h1>User profile <small>for {{ fullname }}</small></h1>
 
     <table class="table table-bordered table-striped user-data">
         <tbody>
@@ -21,10 +21,6 @@
                 <th>{% trans 'Name:' %}</th>
                 <td>{{ fullname }}</td>
             </tr>
-            <tr>
-                <th>{% trans 'Email:' %}</th>
-                <td>{{ email }}</td>
-            </tr>
             {% if creation %}
             <tr>
                 <th>{% trans 'Creation:' %}</th>
-- 
cgit