HTTPS for gravatars is enabled for SMF version 2.0.14 and above.

realdigger · May 17, 2017 · 4d9b0d7 · 4d9b0d7
1 parent 8e5e8d3
commit 4d9b0d7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Sources/Mod-Gravatar.php b/Sources/Mod-Gravatar.php
@@ -134,15 +134,18 @@ function addGravatarAdminSettings($return_config = false)
  */
 function getGravatar($email = '', $image = false)
 {
-    global $modSettings;
+    global $smcFunc, $modSettings, $forum_version;
+
+    // We can enable https avatars only for SMF 2.0.14 and above.
+    $forum_version_int = (int)str_replace('.', '', trim($smcFunc['substr']($forum_version, 3)));
 
     $gravatarHash = md5(strtolower($email));
     $gravatarStyle = ($modSettings['gravatar_style'] == 'custom' && !empty($modSettings['gravatar_style_custom_url'])) ? urlencode($modSettings['gravatar_style_custom_url']) : ((!empty($modSettings['gravatar_style']) && $modSettings['gravatar_style'] != 'custom') ? $modSettings['gravatar_style'] : '');
     $gravatarRating = !empty($modSettings['gravatar_rating']) ? $modSettings['gravatar_rating'] : 'g';
     $gravatarWidth = !empty($modSettings['avatar_max_width_external']) ? $modSettings['avatar_max_width_external'] : 65;
     $gravatarHeight = !empty($modSettings['avatar_max_height_external']) ? $modSettings['avatar_max_height_external'] : 65;
     $gravatarSize = $gravatarWidth < $gravatarHeight ? $gravatarWidth : $gravatarHeight;
-    $gravatar = 'http://gravatar.com/avatar/' . $gravatarHash . '?d=' . $gravatarStyle . '&amp;s=' . $gravatarSize . '&amp;r=' . $gravatarRating;
+    $gravatar = ($forum_version_int >= 2014 ? 'https' : 'http') . '://gravatar.com/avatar/' . $gravatarHash . '?d=' . $gravatarStyle . '&amp;s=' . $gravatarSize . '&amp;r=' . $gravatarRating;
 
     if ($image) {
         $gravatar = '<img class="avatar" src="' . $gravatar . '" alt="" />';