Fix geopip lookup for IPv6 addresses

This commit is contained in:
JonnyWong16 2020-04-28 08:42:00 -07:00
commit 7ce9283421
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 2 additions and 4 deletions

View file

@ -79,7 +79,7 @@
$('#ip_error').html('<i class="fa fa-exclamation-circle"></i> Internal request failed.').show();
},
success: function (result) {
if (result.results === 'error') {
if (result.result === 'error') {
$('#ip_error').html('<i class="fa fa-exclamation-circle"></i> ' + result.message).show();
} else {
var data = result.data;

View file

@ -933,7 +933,7 @@ class PlexTV(object):
return account_details
def get_geoip_lookup(self, ip_address=''):
if not ip_address or not helpers.is_public_ip(ip_address):
if not ip_address or not helpers.is_valid_ip(ip_address):
return
geoip_data = self.get_plextv_geoip(ip_address=ip_address, output_format='xml')

View file

@ -5719,8 +5719,6 @@ class WebInterface(object):
message = 'No IP address provided.'
elif not helpers.is_valid_ip(ip_address):
message = 'Invalid IP address provided: %s' % ip_address
elif not helpers.is_public_ip(ip_address):
message = 'Non-public IP address provided: %s' % ip_address
if message:
return {'result': 'error', 'message': message}