zeke/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up duplicate code

Browse Source
This commit is contained in:
discomrade 2021-10-14 07:04:26 +00:00
parent 132b7ace54
commit bba5e1bff3
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/bans.php
View File

@ -1,8 +1,8 @@
<?php
require 'inc/lib/IP/Lifo/IP/IP.php';
require 'inc/lib/IP/Lifo/IP/BC.php';
require 'inc/lib/IP/Lifo/IP/CIDR.php';
require_once 'inc/lib/IP/Lifo/IP/IP.php';
require_once 'inc/lib/IP/Lifo/IP/BC.php';
require_once 'inc/lib/IP/Lifo/IP/CIDR.php';
use Lifo\IP\CIDR;

21
inc/functions.php
View File

@ -23,10 +23,13 @@ require_once 'inc/mod/auth.php';
require_once 'inc/lock.php';
require_once 'inc/queue.php';
require_once 'inc/polyfill.php';
require_once 'inc/lib/IP/Lifo/IP/IP.php';
@include_once 'inc/lib/parsedown/Parsedown.php'; // fail silently, this isn't a critical piece of code
require_once 'inc/anti-bot.php'; // DELETE ME THIS IS FOR print_err function only!
use Lifo\IP\IP; // for expanding IPv6 address in DNSBL()
if (!extension_loaded('gettext')) {
require_once 'inc/lib/gettext/gettext.inc';
}
@ -1807,23 +1810,7 @@ function ReverseIPv4Octets($ip) {
}
function ReverseIPv6Octets($ip) {
return strrev(implode(".", str_split(str_replace(':', '', inet_expand($ip)))));
}
// copypastad from lib/IP/Lifo/IP.php, TODO replace this with a proper include
function inet_expand($ip)
{
// strip possible cidr notation off
if (($pos = strpos($ip, '/')) !== false) {
$ip = substr($ip, 0, $pos);
}
$bytes = unpack('n*', inet_pton($ip));
if (count($bytes) > 2) {
return implode(':', array_map(function ($b) {
return sprintf("%04x", $b);
}, $bytes));
}
return $ip;
return strrev(implode(".", str_split(str_replace(':', '', IP::inet_expand($ip)))));
}
function wordfilters(&$body) {