Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1173 → Rev 1174

/trunk/plugins/viathinksoft/objectTypes/ipv4/OIDplusIpv4.class.php
50,10 → 50,9
if (strpos($ipv4, '/') === false) $ipv4 .= '/32';
list($bare, $cidr) = explode('/', $ipv4);
$this->bare = $bare;
if (is_numeric($cidr)) throw new OIDplusException(_L('Invalid IPv4'));
if (!is_numeric($cidr)) throw new OIDplusException(_L('Invalid IPv4'));
$this->cidr = (int)$cidr;
if (!ipv4_valid($bare)) throw new OIDplusException(_L('Invalid IPv4'));
if (!is_numeric($cidr)) throw new OIDplusException(_L('Invalid IPv4'));
if ($cidr < 0) throw new OIDplusException(_L('Invalid IPv4'));
if ($cidr > 32) throw new OIDplusException(_L('Invalid IPv4'));
$this->bare = ipv4_normalize($this->bare);
/trunk/plugins/viathinksoft/objectTypes/ipv6/OIDplusIpv6.class.php
50,10 → 50,9
if (strpos($ipv6, '/') === false) $ipv6 .= '/128';
list($bare, $cidr) = explode('/', $ipv6);
$this->bare = $bare;
if (is_numeric($cidr)) throw new OIDplusException(_L('Invalid IPv4'));
if (!is_numeric($cidr)) throw new OIDplusException(_L('Invalid IPv6'));
$this->cidr = (int)$cidr;
if (!ipv6_valid($bare)) throw new OIDplusException(_L('Invalid IPv6'));
if (!is_numeric($cidr)) throw new OIDplusException(_L('Invalid IPv6'));
if ($cidr < 0) throw new OIDplusException(_L('Invalid IPv6'));
if ($cidr > 128) throw new OIDplusException(_L('Invalid IPv6'));
$this->bare = ipv6_normalize($this->bare);