From 2f0c6c99e07ae1aa2a7217bdad39e213557c49c2 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 21 Aug 2017 14:18:40 -0400
Subject: [PATCH] FIX: ip lookup not working

Also add a powered by line so it is clear this makes an external service call
---
 .../discourse/templates/components/ip-lookup.hbs           | 1 +
 app/assets/stylesheets/common/admin/admin_base.scss        | 7 +++++++
 app/controllers/admin/users_controller.rb                  | 2 +-
 config/locales/client.en.yml                               | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 44e1b1809b9..7fc97aeb052 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -7,6 +7,7 @@
   <div class="location-box">
     <a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
     <h4>{{i18n 'ip_lookup.title'}}</h4>
+    <p class='powered-by'>{{{i18n 'ip_lookup.powered_by'}}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 6ad6b69dcec..569d2d08905 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -193,6 +193,13 @@ td.flaggers td {
     background-color: $secondary;
     padding: 12px 12px 5px;
 
+    .powered-by {
+      font-size: 0.80em;
+      position: absolute;
+      bottom: -10px;
+      left: 10px;
+    }
+
     .other-accounts {
       margin: 5px 0 0;
       max-height: 200px;
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 4d0d9cc433b..f2f9eca6589 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -292,7 +292,7 @@ class Admin::UsersController < Admin::AdminController
     ip = params[:ip]
 
     # should we cache results in redis?
-    location = Excon.get("http://ipinfo.io/#{ip}/json", read_timeout: 30, connect_timeout: 30).body rescue nil
+    location = Excon.get("https://ipinfo.io/#{ip}/json", read_timeout: 10, connect_timeout: 10).body rescue nil
 
     render json: location
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1ce75d44ed8..c11c8052bb5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -550,6 +550,7 @@ en:
       topics_entered: "topics entered"
       post_count: "# posts"
       confirm_delete_other_accounts: "Are you sure you want to delete these accounts?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
 
     user_fields:
       none: "(select an option)"