ukamnya/roundcube-defense
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename functions to ipv4 or ipv6, begin ipv6 code

Browse Source
This commit is contained in:
Steve Allison 2013-02-21 12:38:38 +00:00
parent 83a990e4e3
commit 94c87c5f89
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
defense.php
View File

@ -42,7 +42,7 @@ class defense extends rcube_plugin {
private function isIPinArray($ip, $array) { private function isIPinArray($ip, $array) {
foreach ($array as $value) { foreach ($array as $value) {
if ((strpos($value, '/') === false) && ($ip == $value)) { return true; } if ((strpos($value, '/') === false) && ($ip == $value)) { return true; }
if ($this->isIPinCIDR($ip, $value)) { return true; } if ($this->isIPv4inCIDR($ip, $value)) { return true; }
} }
return false; return false;
} }
@ -53,13 +53,22 @@ class defense extends rcube_plugin {
* @param string cidr address * @param string cidr address
* @return bool * @return bool
*/ */
private function isIPinCIDR($ip, $cidr) { private function isIPv4inCIDR($ip, $cidr) {
list($subnet, $mask) = explode('/', $cidr); list($subnet, $mask) = explode('/', $cidr);
return ((ip2long($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long($subnet)); return ((ip2long($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long($subnet));
} }
/**
* Check string if it is ipv6
*
* @param string ip address
* @return bool
*/
private function isIPv6($ip) {
return (((!preg_match('/[\.\/:0-9a-f]/', strtolower($ip))) || (substr_count($ip, ':') < 2)) ? true : false)
}
/** /**
* Contructor, initialization * Constructor, initialization
* *
*/ */
public function init() { public function init() {