From 46d8c4935555bedb2a342c41be4643695f00533a Mon Sep 17 00:00:00 2001
From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com>
Date: Mon, 17 Sep 2018 23:38:20 -0400
Subject: [PATCH] Fix for Sonarr and Radarr settings testing

---
 bazarr.py          | 2 +-
 views/settings.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bazarr.py b/bazarr.py
index 6c52fdb82..908afd903 100644
--- a/bazarr.py
+++ b/bazarr.py
@@ -1750,7 +1750,7 @@ def api_history():
 @custom_auth_basic(check_credentials)
 def test_url(protocol, url):
     try:
-        result = requests.get(protocol + "://" + url).json()['version']
+        result = requests.get(protocol + "://" + url, allow_redirects=False).json()['version']
     except:
         return dict(status=False)
     else:
diff --git a/views/settings.tpl b/views/settings.tpl
index 164c55f9d..392246f29 100644
--- a/views/settings.tpl
+++ b/views/settings.tpl
@@ -1882,7 +1882,7 @@
         } else {
             protocol = 'http';
         }
-        sonarr_url = $('#settings_sonarr_ip').val() + ":" + $('#settings_sonarr_port').val() + "/" + $('#settings_sonarr_baseurl').val().replace(/^\/|\/$/g, '') + "/api/system/status?apikey=" + $('#settings_sonarr_apikey').val();
+        sonarr_url = $('#settings_sonarr_ip').val() + ":" + $('#settings_sonarr_port').val() + $('#settings_sonarr_baseurl').val().replace(/\/$/, "") + "/api/system/status?apikey=" + $('#settings_sonarr_apikey').val();
 
         $.getJSON("{{base_url}}test_url/" + protocol + "/" + encodeURIComponent(sonarr_url), function (data) {
             if (data.status) {
@@ -1921,7 +1921,7 @@
         } else {
             protocol = 'http';
         }
-        radarr_url = $('#settings_radarr_ip').val() + ":" + $('#settings_radarr_port').val() + "/" + $('#settings_radarr_baseurl').val().replace(/^\/|\/$/g, '') + "/api/system/status?apikey=" + $('#settings_radarr_apikey').val();
+        radarr_url = $('#settings_radarr_ip').val() + ":" + $('#settings_radarr_port').val() + $('#settings_radarr_baseurl').val().replace(/\/$/, "") + "/api/system/status?apikey=" + $('#settings_radarr_apikey').val();
 
         $.getJSON("{{base_url}}test_url/" + protocol + "/" + encodeURIComponent(radarr_url), function (data) {
             if (data.status) {