mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2024-03-22 13:10:41 +08:00
QA
This commit is contained in:
parent
b21efd8336
commit
805eb288d9
|
@ -82,7 +82,6 @@ class TrafficLimiter extends AbstractPersistence
|
||||||
*/
|
*/
|
||||||
public static function setConfiguration(Configuration $conf)
|
public static function setConfiguration(Configuration $conf)
|
||||||
{
|
{
|
||||||
|
|
||||||
self::setLimit($conf->getKey('limit', 'traffic'));
|
self::setLimit($conf->getKey('limit', 'traffic'));
|
||||||
self::setPath($conf->getKey('dir', 'traffic'));
|
self::setPath($conf->getKey('dir', 'traffic'));
|
||||||
self::setExemptedIp($conf->getKey('exemptedIp', 'traffic'));
|
self::setExemptedIp($conf->getKey('exemptedIp', 'traffic'));
|
||||||
|
@ -127,11 +126,11 @@ class TrafficLimiter extends AbstractPersistence
|
||||||
|
|
||||||
// Check if $_ipKey is exempted from ratelimiting
|
// Check if $_ipKey is exempted from ratelimiting
|
||||||
if (!is_null(self::$_exemptedIp)) {
|
if (!is_null(self::$_exemptedIp)) {
|
||||||
$exIp_array = explode(",", self::$_exemptedIp);
|
$exIp_array = explode(',', self::$_exemptedIp);
|
||||||
foreach ($exIp_array as $ipRange) {
|
foreach ($exIp_array as $ipRange) {
|
||||||
// Match $_ipKey to $ipRange and if it matches it will return with a true
|
// Match $_ipKey to $ipRange and if it matches it will return with a true
|
||||||
$address = \IPLib\Factory::addressFromString($_SERVER[self::$_ipKey]);
|
$address = \IPLib\Factory::addressFromString($_SERVER[self::$_ipKey]);
|
||||||
$range = \IPLib\Factory::rangeFromString(trim($ipRange));
|
$range = \IPLib\Factory::rangeFromString(trim($ipRange));
|
||||||
// If $range is null something went wrong (possible invalid ip given in config)
|
// If $range is null something went wrong (possible invalid ip given in config)
|
||||||
if ($range == null) {
|
if ($range == null) {
|
||||||
$contained = false;
|
$contained = false;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user