diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 883d4d3d..2dd20ff8 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -676,27 +676,6 @@ -
- -

- Allow Tautulli to use the dynamic anonymous redirect service listed here. - Disable to specify your own service. -

-
-
-
- -
-
- -
-
-

Backlink protection via anonymizer service, must end in "?". Leave blank to disable.

-
-
-

Authentication

@@ -2416,7 +2395,6 @@ $(document).ready(function() { initConfigCheckbox('#api_enabled'); initConfigCheckbox('#enable_https'); - initConfigCheckbox('#anon_redirect_dynamic', null, true); initConfigCheckbox('#https_create_cert'); initConfigCheckbox('#check_github'); initConfigCheckbox('#monitor_pms_updates'); diff --git a/plexpy/helpers.py b/plexpy/helpers.py index dc83fcb3..c2594412 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -784,36 +784,9 @@ def whois_lookup(ip_address): return whois_info -# Taken from SickRage def anon_url(*url): - """ - Return a URL string consisting of the Anonymous redirect URL and an arbitrary number of values appended. - """ - if plexpy.CONFIG.ANON_REDIRECT_DYNAMIC: - cache_time = timestamp() - cache_filepath = os.path.join(plexpy.CONFIG.CACHE_DIR, 'anonymizer.json') - try: - with open(cache_filepath, 'r', encoding='utf-8') as cache_file: - cache_data = json.load(cache_file) - if cache_time - cache_data['_cache_time'] < 86400: # 24 hours - anon_redirect = cache_data['anon_redirect'] - else: - raise - except: - try: - anon_redirect = request.request_content('https://tautulli.com/anonymizer.txt').decode('utf-8') - cache_data = { - 'anon_redirect': anon_redirect, - '_cache_time': cache_time - } - with open(cache_filepath, 'w', encoding='utf-8') as cache_file: - json.dump(cache_data, cache_file) - except: - anon_redirect = plexpy.CONFIG.ANON_REDIRECT - else: - anon_redirect = plexpy.CONFIG.ANON_REDIRECT - - return '' if None in url else '%s%s' % (anon_redirect, ''.join(str(s) for s in url)) + # Removed anonymous redirect and just return the URL + return '' if None in url else ''.join(str(s) for s in url) def get_img_service(include_self=False):