github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 13:41:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove ipaddr js XHR

Browse source
This commit is contained in:
JonnyWong16 2020-03-03 09:38:22 -08:00
parent 533b8076e4
commit 11299291b0
2 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/interfaces/default/base.html
View file

@ -291,6 +291,7 @@ ${next.modalIncludes()}
<script src="${http_root}js/bootstrap-hover-dropdown.min.js"></script> <script src="${http_root}js/bootstrap-hover-dropdown.min.js"></script>
<script src="${http_root}js/pnotify.custom.min.js"></script> <script src="${http_root}js/pnotify.custom.min.js"></script>
<script src="${http_root}js/platform.min.js"></script> <script src="${http_root}js/platform.min.js"></script>
<script src="${http_root}js/ipaddr.min.js"></script>
<script src="${http_root}js/script.js${cache_param}"></script> <script src="${http_root}js/script.js${cache_param}"></script>
<script src="${http_root}js/jquery.tripleclick.min.js"></script> <script src="${http_root}js/jquery.tripleclick.min.js"></script>
% if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS: % if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:

46
data/interfaces/default/js/script.js
View file

@ -258,33 +258,31 @@ $.cachedScript = function (url) {
function isPrivateIP(ip_address) { function isPrivateIP(ip_address) {
var defer = $.Deferred(); var defer = $.Deferred();
$.cachedScript('js/ipaddr.min.js').done(function () { if (ipaddr.isValid(ip_address)) {
if (ipaddr.isValid(ip_address)) { var addr = ipaddr.process(ip_address);
var addr = ipaddr.process(ip_address);
var rangeList = []; var rangeList = [];
if (addr.kind() === 'ipv4') { if (addr.kind() === 'ipv4') {
rangeList = [ rangeList = [
ipaddr.parseCIDR('127.0.0.0/8'), ipaddr.parseCIDR('127.0.0.0/8'),
ipaddr.parseCIDR('10.0.0.0/8'), ipaddr.parseCIDR('10.0.0.0/8'),
ipaddr.parseCIDR('172.16.0.0/12'), ipaddr.parseCIDR('172.16.0.0/12'),
ipaddr.parseCIDR('192.168.0.0/16') ipaddr.parseCIDR('192.168.0.0/16')
]; ];
} else {
rangeList = [
ipaddr.parseCIDR('fd00::/8')
];
}
if (ipaddr.subnetMatch(addr, rangeList, -1) >= 0) {
defer.resolve();
} else {
defer.reject();
}
} else { } else {
defer.resolve('n/a'); rangeList = [
ipaddr.parseCIDR('fd00::/8')
];
} }
});
if (ipaddr.subnetMatch(addr, rangeList, -1) >= 0) {
defer.resolve();
} else {
defer.reject();
}
} else {
defer.resolve('n/a');
}
return defer.promise(); return defer.promise();
} }