pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ip-address-sorting into its own file

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-05-30 12:43:53 +02:00
committed by Mcat12
parent f830bfbc7b
commit a027715247
3 changed files with 111 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network.php
+1
View File
@@ -73,4 +73,5 @@ $token = $_SESSION['token'];
?>
<script src="scripts/vendor/moment.min.js"></script>
<script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
<script src="scripts/pi-hole/js/network.js"></script>
scripts/pi-hole/js/ip-address-sorting.js
+110
View File
@@ -0,0 +1,110 @@
/* Pi-hole: A black hole for Internet advertisements
* (c) 2017 Pi-hole, LLC (https://pi-hole.net)
* Network-wide ad blocking via your own hardware.
*
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
jQuery.extend( jQuery.fn.dataTableExt.oSort,
{
"ip-address-pre": function ( a )
{
if (!a) { return 0 }
var i, item;
var m = a.split("."),
n = a.split(":"),
x = "",
xa = "";
if (m.length == 4)
{
// IPV4
for(i = 0; i < m.length; i++)
{
item = m[i];
if(item.length == 1)
{
x += "00" + item;
}
else if(item.length == 2)
{
x += "0" + item;
}
else
{
x += item;
}
}
}
else if (n.length > 0)
{
// IPV6
var count = 0;
for(i = 0; i < n.length; i++)
{
item = n[i];
if (i > 0)
{
xa += ":";
}
if(item.length === 0)
{
count += 0;
}
else if(item.length == 1)
{
xa += "000" + item;
count += 4;
}
else if(item.length == 2)
{
xa += "00" + item;
count += 4;
}
else if(item.length == 3)
{
xa += "0" + item;
count += 4;
}
else
{
xa += item;
count += 4;
}
}
// Padding the ::
n = xa.split(":");
var paddDone = 0;
for (i = 0; i < n.length; i++)
{
item = n[i];
if (item.length === 0 && paddDone === 0)
{
for(var padding = 0 ; padding < (32-count) ; padding++)
{
x += "0";
paddDone = 1;
}
}
else
{
x += item;
}
}
}
return x;
},
"ip-address-asc": function ( a, b )
{
return ((a < b) ? -1 : ((a > b) ? 1 : 0));
},
"ip-address-desc": function ( a, b )
{
return ((a < b) ? 1 : ((a > b) ? -1 : 0));
}
});
scripts/pi-hole/js/network.js
-105
View File
@@ -61,111 +61,6 @@ function mixColors(ratio, rgb1, rgb2)
(1.0-ratio)*rgb1[2]+ratio*rgb2[2]];
}
jQuery.extend( jQuery.fn.dataTableExt.oSort,
{
"ip-address-pre": function ( a )
{
if (!a) { return 0 }
var i, item;
var m = a.split("."),
n = a.split(":"),
x = "",
xa = "";
if (m.length == 4)
{
// IPV4
for(i = 0; i < m.length; i++)
{
item = m[i];
if(item.length == 1)
{
x += "00" + item;
}
else if(item.length == 2)
{
x += "0" + item;
}
else
{
x += item;
}
}
}
else if (n.length > 0)
{
// IPV6
var count = 0;
for(i = 0; i < n.length; i++)
{
item = n[i];
if (i > 0)
{
xa += ":";
}
if(item.length === 0)
{
count += 0;
}
else if(item.length == 1)
{
xa += "000" + item;
count += 4;
}
else if(item.length == 2)
{
xa += "00" + item;
count += 4;
}
else if(item.length == 3)
{
xa += "0" + item;
count += 4;
}
else
{
xa += item;
count += 4;
}
}
// Padding the ::
n = xa.split(":");
var paddDone = 0;
for (i = 0; i < n.length; i++)
{
item = n[i];
if (item.length === 0 && paddDone === 0)
{
for(var padding = 0 ; padding < (32-count) ; padding++)
{
x += "0";
paddDone = 1;
}
}
else
{
x += item;
}
}
}
return x;
},
"ip-address-asc": function ( a, b )
{
return ((a < b) ? -1 : ((a > b) ? 1 : 0));
},
"ip-address-desc": function ( a, b )
{
return ((a < b) ? 1 : ((a > b) ? -1 : 0));
}
});
$(document).ready(function() {
tableApi = $("#network-entries").DataTable( {
"rowCallback": function( row, data, index )