From 895bb3fd608a7a13848909538fc957e24aa61383 Mon Sep 17 00:00:00 2001
From: Jesse Bickel <bickelj@gmail.com>
Date: Mon, 7 Dec 2015 14:41:35 -0600
Subject: [PATCH] Use gravatar when enabled.

---
 index.html                  |  2 +-
 modules/UI/avatar/Avatar.js | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index facee3d0e..8b134f2cc 100644
--- a/index.html
+++ b/index.html
@@ -201,7 +201,7 @@
         </div>
         <div id="settingsmenu" class="right-panel">
             <div class="icon-settings" data-i18n="settings.title"></div>
-            <img id="avatar" src="https://www.gravatar.com/avatar/87291c37c25be69a072a4514931b1749?d=wavatar&size=30"/>
+            <img id="avatar" src="images/avatar2.png"/>
             <div class="arrow-up"></div>
             <input type="text" id="setDisplayName" data-i18n="[placeholder]settings.name" placeholder="Name">
             <input type="text" id="setEmail" placeholder="E-Mail">
diff --git a/modules/UI/avatar/Avatar.js b/modules/UI/avatar/Avatar.js
index 6ab1327e4..d59f494c7 100644
--- a/modules/UI/avatar/Avatar.js
+++ b/modules/UI/avatar/Avatar.js
@@ -1,4 +1,4 @@
-/* global Strophe, APP, MD5 */
+/* global Strophe, APP, MD5, config */
 var Settings = require("../../settings/Settings");
 
 var users = {};
@@ -57,12 +57,16 @@ var Avatar = {
                 "No avatar stored yet for " + jid + " - using JID as ID");
             id = jid;
         }
-        return 'https://www.gravatar.com/avatar/' +
-            MD5.hexdigest(id.trim().toLowerCase()) +
-            "?d=wavatar&size=" + (size || "30");
+        if (config.enableThirdPartyRequests === true) {
+            return 'https://www.gravatar.com/avatar/' +
+                MD5.hexdigest(id.trim().toLowerCase()) +
+                "?d=wavatar&size=" + (size || "30");
+        } else {
+            return 'images/avatar2.png';
+        }
     }
 
 };
 
 
-module.exports = Avatar;
\ No newline at end of file
+module.exports = Avatar;