From ee033f2198969af0a505f19be9d04ce13e929fd6 Mon Sep 17 00:00:00 2001
From: Khanh Ngo <ngokhanhit@gmail.com>
Date: Wed, 13 Jul 2016 21:33:21 +0700
Subject: [PATCH 1/2] Add Gravatar to display user's avatar

---
 app/lib/utils.py                | 7 +++++++
 app/templates/base.html         | 6 +++---
 app/templates/user_profile.html | 2 +-
 app/views.py                    | 5 +++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/lib/utils.py b/app/lib/utils.py
index 3498c10..d86e8ec 100644
--- a/app/lib/utils.py
+++ b/app/lib/utils.py
@@ -3,6 +3,8 @@ import sys
 import json
 import requests
 import urlparse
+import hashlib
+
 from app import app
 from distutils.version import StrictVersion
 
@@ -145,3 +147,8 @@ def pdns_api_extended_uri(version):
         return "/api/v1"
     else:
         return ""
+
+def email_to_gravatar_url(email, size=100):
+    hash_string = hashlib.md5(email).hexdigest()
+    schema = 'https' if app.config['SSL'] else 'http'
+    return "%s://s.gravatar.com/avatar/%s?s=%s" % (schema, hash_string, size)
diff --git a/app/templates/base.html b/app/templates/base.html
index fd25cc7..06f239b 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -65,7 +65,7 @@
               {% if current_user.avatar %}
               <img src="{{ url_for('user_avatar', filename=current_user.avatar) }}" class="user-image" alt="User Image"/>
               {% else %}
-              <img src="{{ url_for('static', filename='adminlte2/dist/img/avatar.png') }}" class="user-image" alt="User Image"/>
+              <img src="{{ current_user.email|email_to_gravatar_url(size=80) }}" class="user-image" alt="User Image"/>
               {% endif %}
               <span class="hidden-xs">
                 {{ current_user.firstname }}
@@ -76,7 +76,7 @@
                   {% if current_user.avatar %}
                   <img src="{{ url_for('user_avatar', filename=current_user.avatar) }}" class="img-circle" alt="User Image"/>
                   {% else %}
-                  <img src="{{ url_for('static', filename='adminlte2/dist/img/avatar.png') }}" class="img-circle" alt="User Image"/>
+                  <img src="{{ current_user.email|email_to_gravatar_url(size=160) }}" class="img-circle" alt="User Image"/>
                   {% endif %}
                   <p>
                     {{ current_user.firstname }} {{ current_user.lastname }}
@@ -111,7 +111,7 @@
           {% if current_user.avatar %}
           <img src="{{ url_for('user_avatar', filename=current_user.avatar) }}" class="img-circle" alt="User Image"/>
           {% else %}
-          <img src="{{ url_for('static', filename='adminlte2/dist/img/avatar.png') }}" class="img-circle" alt="User Image"/>
+          <img src="{{ current_user.email|email_to_gravatar_url(size=100) }}" class="img-circle" alt="User Image"/>
           {% endif %}
         </div>
         <div class="pull-left info">
diff --git a/app/templates/user_profile.html b/app/templates/user_profile.html
index b69d227..19201dc 100644
--- a/app/templates/user_profile.html
+++ b/app/templates/user_profile.html
@@ -67,7 +67,7 @@
                                                     src="{{ url_for('user_avatar', filename=current_user.avatar) }}"
                                                     alt="" / style="width: 200px; height: 200px;"> {%
                                                 else %} <img
-                                                    src="http://www.placehold.it/200x200/EFEFEF/AAAAAA&amp;text=no+image"
+                                                    src="{{ current_user.email|email_to_gravatar_url(size=200) }}"
                                                     alt="" /> {% endif %}
                                             </div>
                                             <div>
diff --git a/app/views.py b/app/views.py
index 8675e3e..c938f8c 100644
--- a/app/views.py
+++ b/app/views.py
@@ -22,6 +22,7 @@ from optparse import Values
 jinja2.filters.FILTERS['display_record_name'] = utils.display_record_name
 jinja2.filters.FILTERS['display_master_name'] = utils.display_master_name
 jinja2.filters.FILTERS['display_second_to_time'] = utils.display_time
+jinja2.filters.FILTERS['email_to_gravatar_url'] = utils.email_to_gravatar_url
 
 # Flag for pdns v4.x.x
 # TODO: Find another way to do this
@@ -68,6 +69,10 @@ def before_request():
     g.user = current_user
     login_manager.anonymous_user = Anonymous
 
+    # set website SSL status
+    app.config['SSL'] = True if request.is_secure else False
+
+
 @login_manager.user_loader
 def load_user(id):
     """

From e7a4fb5e6ad055278235ffeb27ab49c2a58c6e9c Mon Sep 17 00:00:00 2001
From: Khanh Ngo <ngokhanhit@gmail.com>
Date: Thu, 14 Jul 2016 00:05:55 +0700
Subject: [PATCH 2/2] Force loading gravatar over https

---
 app/lib/utils.py | 3 +--
 app/views.py     | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/lib/utils.py b/app/lib/utils.py
index d86e8ec..45799c2 100644
--- a/app/lib/utils.py
+++ b/app/lib/utils.py
@@ -150,5 +150,4 @@ def pdns_api_extended_uri(version):
 
 def email_to_gravatar_url(email, size=100):
     hash_string = hashlib.md5(email).hexdigest()
-    schema = 'https' if app.config['SSL'] else 'http'
-    return "%s://s.gravatar.com/avatar/%s?s=%s" % (schema, hash_string, size)
+    return "https://s.gravatar.com/avatar/%s?s=%s" % (hash_string, size)
diff --git a/app/views.py b/app/views.py
index c938f8c..75eb3b4 100644
--- a/app/views.py
+++ b/app/views.py
@@ -69,9 +69,6 @@ def before_request():
     g.user = current_user
     login_manager.anonymous_user = Anonymous
 
-    # set website SSL status
-    app.config['SSL'] = True if request.is_secure else False
-
 
 @login_manager.user_loader
 def load_user(id):