Permalink
Browse files

- again some coding standard fixes

git-svn-id: http://svn.php.net/repository/pear/packages/Net_IPv4/trunk@201044 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent 5736f13 commit 8a9a97892b138888d23f1e8bd3e8426f2b0922c5 @bate bate committed Nov 22, 2005
Showing with 13 additions and 8 deletions.
  1. +10 −5 IPv4.php
  2. +3 −3 package.xml
View
@@ -232,7 +232,8 @@ function parseAddress($address)
*
* @return mixed true if no errors occured, otherwise PEAR_Error object
*/
- function calculate() {
+ function calculate()
+ {
$validNM = $GLOBALS['Net_IPv4_Netmask_Map'];
if (! is_a($this, "net_ipv4")) {
@@ -273,7 +274,8 @@ function calculate() {
return true;
}
- function getNetmask($length) {
+ function getNetmask($length)
+ {
if (! PEAR::isError($ipobj = Net_IPv4::parseAddress("0.0.0.0/" . $length))) {
$mask = $ipobj->netmask;
unset($ipobj);
@@ -282,7 +284,8 @@ function getNetmask($length) {
return false;
}
- function getNetLength($netmask) {
+ function getNetLength($netmask)
+ {
if (! PEAR::isError($ipobj = Net_IPv4::parseAddress("0.0.0.0/" . $netmask))) {
$bitmask = $ipobj->bitmask;
unset($ipobj);
@@ -291,7 +294,8 @@ function getNetLength($netmask) {
return false;
}
- function getSubnet($ip, $netmask) {
+ function getSubnet($ip, $netmask)
+ {
if (! PEAR::isError($ipobj = Net_IPv4::parseAddress($ip . "/" . $netmask))) {
$net = $ipobj->network;
unset($ipobj);
@@ -300,7 +304,8 @@ function getSubnet($ip, $netmask) {
return false;
}
- function inSameSubnet($ip1, $ip2) {
+ function inSameSubnet($ip1, $ip2)
+ {
if (! is_object($ip1) || strcasecmp(get_class($ip1), 'net_ipv4') <> 0) {
$ipobj1 = Net_IPv4::parseAddress($ip1);
if (PEAR::isError($ipobj)) {
View
@@ -12,9 +12,9 @@
</description>
<maintainers>
<maintainer>
- <user>ekilfoil</user>
- <name>Eric Kilfoil</name>
- <email>eric@ypass.net</email>
+ <user>bate</user>
+ <name>Marco Kaiser</name>
+ <email>bate@php.net</email>
<role>lead</role>
</maintainer>
</maintainers>

0 comments on commit 8a9a978

Please sign in to comment.