mirror of
https://github.com/torrentpier/torrentpier
synced 2025-08-21 13:54:02 -07:00
New implementation of IPHelper (#665)
This commit is contained in:
Roman Kelesidis
GitHub
parent
f4bf7111bc
commit
e99de931a7
3 changed files with 68 additions and 111 deletions
|
|
@ -38,9 +38,9 @@
|
||||||
"google/recaptcha": "^1.2",
|
"google/recaptcha": "^1.2",
|
||||||
"guzzlehttp/guzzle": "^7.5",
|
"guzzlehttp/guzzle": "^7.5",
|
||||||
"guzzlehttp/psr7": "^2.4",
|
"guzzlehttp/psr7": "^2.4",
|
||||||
"longman/ip-tools": "1.2.1",
|
|
||||||
"monolog/monolog": "^2.9",
|
"monolog/monolog": "^2.9",
|
||||||
"rych/bencode": "v1.0.0",
|
"rych/bencode": "v1.0.0",
|
||||||
|
"s1lentium/iptools": "1.*",
|
||||||
"samdark/sitemap": "2.4.0",
|
"samdark/sitemap": "2.4.0",
|
||||||
"symfony/mailer": "^5.4",
|
"symfony/mailer": "^5.4",
|
||||||
"symfony/polyfill": "v1.27.0",
|
"symfony/polyfill": "v1.27.0",
|
||||||
|
|
|
||||||
117
composer.lock
generated
117
composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "a0a31557a48a379fcaf7e44571398d48",
|
"content-hash": "476e68bd0e844794d1f21d771e06ebad",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "bugsnag/bugsnag",
|
"name": "bugsnag/bugsnag",
|
||||||
|
|
@ -904,66 +904,6 @@
|
||||||
],
|
],
|
||||||
"time": "2023-03-09T13:19:02+00:00"
|
"time": "2023-03-09T13:19:02+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "longman/ip-tools",
|
|
||||||
"version": "1.2.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/akalongman/php-ip-tools.git",
|
|
||||||
"reference": "6c050dfbf91811d14b9b3aa31fb7116eac0f0a18"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/akalongman/php-ip-tools/zipball/6c050dfbf91811d14b9b3aa31fb7116eac0f0a18",
|
|
||||||
"reference": "6c050dfbf91811d14b9b3aa31fb7116eac0f0a18",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ext-bcmath": "*",
|
|
||||||
"php": ">=5.5"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpspec/phpspec": "~2.1",
|
|
||||||
"phpunit/phpunit": "~4.1",
|
|
||||||
"squizlabs/php_codesniffer": "~2.3"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Longman\\IPTools\\": "src/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Avtandil Kikabidze aka LONGMAN",
|
|
||||||
"email": "akalongman@gmail.com",
|
|
||||||
"homepage": "https://longman.me",
|
|
||||||
"role": "Developer"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "PHP IP Tools for manipulation with IPv4 and IPv6",
|
|
||||||
"homepage": "https://github.com/akalongman/php-ip-tools",
|
|
||||||
"keywords": [
|
|
||||||
"IP",
|
|
||||||
"Match",
|
|
||||||
"compare",
|
|
||||||
"ipv4",
|
|
||||||
"ipv6",
|
|
||||||
"mask",
|
|
||||||
"subnet",
|
|
||||||
"tools",
|
|
||||||
"utilities"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/akalongman/php-ip-tools/issues",
|
|
||||||
"source": "https://github.com/akalongman/php-ip-tools"
|
|
||||||
},
|
|
||||||
"time": "2016-10-23T20:08:46+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
"version": "2.9.1",
|
"version": "2.9.1",
|
||||||
|
|
@ -1548,6 +1488,61 @@
|
||||||
},
|
},
|
||||||
"time": "2014-01-13T00:34:03+00:00"
|
"time": "2014-01-13T00:34:03+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "s1lentium/iptools",
|
||||||
|
"version": "v1.1.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/S1lentium/IPTools.git",
|
||||||
|
"reference": "f6f8ab6132ca7443bd7cced1681f5066d725fd5f"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/S1lentium/IPTools/zipball/f6f8ab6132ca7443bd7cced1681f5066d725fd5f",
|
||||||
|
"reference": "f6f8ab6132ca7443bd7cced1681f5066d725fd5f",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-bcmath": "*",
|
||||||
|
"php": ">=5.4.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.0",
|
||||||
|
"satooshi/php-coveralls": "~1.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"IPTools\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Safarov Alisher",
|
||||||
|
"email": "alisher.safarov@outlook.com",
|
||||||
|
"homepage": "https://github.com/S1lentium"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "PHP Library for manipulating network addresses (IPv4 and IPv6)",
|
||||||
|
"keywords": [
|
||||||
|
"IP",
|
||||||
|
"IP-Tools",
|
||||||
|
"cidr",
|
||||||
|
"ipv4",
|
||||||
|
"ipv6",
|
||||||
|
"network",
|
||||||
|
"subnet"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/S1lentium/IPTools/issues",
|
||||||
|
"source": "https://github.com/S1lentium/IPTools/tree/master"
|
||||||
|
},
|
||||||
|
"time": "2018-09-19T06:15:53+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "samdark/sitemap",
|
"name": "samdark/sitemap",
|
||||||
"version": "2.4.0",
|
"version": "2.4.0",
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
namespace TorrentPier\Helpers;
|
namespace TorrentPier\Helpers;
|
||||||
|
|
||||||
use Longman\IPTools\Ip;
|
use IPTools\IP;
|
||||||
|
|
||||||
use function strlen;
|
use function strlen;
|
||||||
|
|
||||||
|
|
@ -22,74 +22,36 @@ class IPHelper
|
||||||
/**
|
/**
|
||||||
* Decode original IP
|
* Decode original IP
|
||||||
*
|
*
|
||||||
* @param $ip
|
* @param string $ip
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function encodeIP($ip): string
|
public static function encodeIP(string $ip): string
|
||||||
{
|
{
|
||||||
return Ip::ip2long($ip);
|
return IP::parse($ip)->toLong();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recovery of decoded IP
|
* Recovery of decoded IP
|
||||||
*
|
*
|
||||||
* @param $ip
|
* @param string|int $ip
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function decodeIP($ip): string
|
public static function decodeIP($ip): string
|
||||||
{
|
{
|
||||||
return Ip::long2ip($ip);
|
return (string)IP::parseLong((int)$ip);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checking IP for validity
|
* Get IP version
|
||||||
*
|
*
|
||||||
* @param $ip
|
* @param string $ip
|
||||||
*
|
* @return string
|
||||||
* @return bool
|
|
||||||
*/
|
*/
|
||||||
public static function isValid($ip): bool
|
public static function getVersion(string $ip): string
|
||||||
{
|
{
|
||||||
return Ip::isValid($ip);
|
return IP::parse($ip)->getVersion();
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checking if it is a local IP
|
|
||||||
*
|
|
||||||
* @param $ip
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public static function isLocal($ip): bool
|
|
||||||
{
|
|
||||||
return IP::isLocal($ip);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checking if it is a remote IP
|
|
||||||
*
|
|
||||||
* @param $ip
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public static function isRemote($ip): bool
|
|
||||||
{
|
|
||||||
return IP::isRemote($ip);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Compare IP
|
|
||||||
*
|
|
||||||
* @param $ip
|
|
||||||
* @param $range
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public static function compareIP($ip, $range): bool
|
|
||||||
{
|
|
||||||
return Ip::compare($ip, $range);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue