format

[PHP-P10.git] / Uplink / IPAddr.class.php

diff --git a/Uplink/IPAddr.class.php b/Uplink/IPAddr.class.php
index 266e4b6a23d944f3ea67929e8ed7e0770a03033b..1eddcbed0aa7f872ff688d122121426430ffd534 100644 (file)
--- a/Uplink/IPAddr.class.php
+++ b/Uplink/IPAddr.class.php
@@ -6,7 +6,7 @@
  * it under the terms of the GNU General Public License as published by *
  * the Free Software Foundation, either version 3 of the License, or    *
  * (at your option) any later version.                                  *
  * it under the terms of the GNU General Public License as published by *
  * the Free Software Foundation, either version 3 of the License, or    *
  * (at your option) any later version.                                  *

- *                                                                      * 
+ *                                                                      *

  * This program is distributed in the hope that it will be useful,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
  * This program is distributed in the hope that it will be useful,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *


@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
  * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************

- * 
+ *

  *  Uplink/IpAddr.class.php
  *
  * This class represents an IPv4 or IPv6 address.
  *  Uplink/IpAddr.class.php
  *
  * This class represents an IPv4 or IPv6 address.


@@ -28,7 +28,7 @@ class IPAddr {
        private static $pattern_IPv4 = '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(|\/[0-9]{1,2})$/';
        private $ip6 = array();
        private $addr_is_ipv6 = false;
        private static $pattern_IPv4 = '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(|\/[0-9]{1,2})$/';
        private $ip6 = array();
        private $addr_is_ipv6 = false;

-       
+

        public function __construct($initial_value) {
                for($i = 0; $i < 8; $i++) {
                        $this->ip6[$i] = 0;
        public function __construct($initial_value) {
                for($i = 0; $i < 8; $i++) {
                        $this->ip6[$i] = 0;


@@ -43,7 +43,7 @@ class IPAddr {
                        $this->parseNumeric($initial_value);
                }
        }
                        $this->parseNumeric($initial_value);
                }
        }

-       
+

        public function parseNumeric($numeric) {
                if(strlen($numeric) == 6) { //IPv4
                        $value = Numerics::numToInt($numeric);
        public function parseNumeric($numeric) {
                if(strlen($numeric) == 6) { //IPv4
                        $value = Numerics::numToInt($numeric);


@@ -67,7 +67,7 @@ class IPAddr {
                        $this->addr_is_ipv6 = true;
                }
        }
                        $this->addr_is_ipv6 = true;
                }
        }

-       
+

        public function parseIPv6($ipv6) {
                if(substr($ipv6,0,2) == "::") $ipv6 = substr($ipv6, 1);
                if(substr($ipv6,-2) == "::") $ipv6 = substr($ipv6, 0, -1);
        public function parseIPv6($ipv6) {
                if(substr($ipv6,0,2) == "::") $ipv6 = substr($ipv6, 1);
                if(substr($ipv6,-2) == "::") $ipv6 = substr($ipv6, 0, -1);


@@ -83,7 +83,7 @@ class IPAddr {
                }
                $this->addr_is_ipv6 = true;
        }
                }
                $this->addr_is_ipv6 = true;
        }

-       
+

        public function parseIPv4($ipv4) {
                $ipv4blocks = explode(".",$ipv4);
                $this->ip6[6] = intval($ipv4blocks[0]) << 8;
        public function parseIPv4($ipv4) {
                $ipv4blocks = explode(".",$ipv4);
                $this->ip6[6] = intval($ipv4blocks[0]) << 8;


@@ -92,19 +92,19 @@ class IPAddr {
                $this->ip6[7] |= intval($ipv4blocks[3]);
                $this->addr_is_ipv6 = false;
        }
                $this->ip6[7] |= intval($ipv4blocks[3]);
                $this->addr_is_ipv6 = false;
        }

-       
+

        public function isIPv6() {
                return $this->addr_is_ipv6;
        }
        public function isIPv6() {
                return $this->addr_is_ipv6;
        }

-       
+

        public function getAddress() {
        public function getAddress() {

-               if($this->isIPv6()) {   
+               if($this->isIPv6()) {

                        $max_start = 0;
                        $max_zeros = 0;
                        $curr_zeros = 0;
                        for ($i = 0; $i < 8; $i++) {
                                if ($this->ip6[$i] == 0)
                        $max_start = 0;
                        $max_zeros = 0;
                        $curr_zeros = 0;
                        for ($i = 0; $i < 8; $i++) {
                                if ($this->ip6[$i] == 0)

-                                       $curr_zeros++;
+                               $curr_zeros++;

                                else if ($curr_zeros > $max_zeros) {
                                        $max_start = $i - $curr_zeros;
                                        $max_zeros = $curr_zeros;
                                else if ($curr_zeros > $max_zeros) {
                                        $max_start = $i - $curr_zeros;
                                        $max_zeros = $curr_zeros;


@@ -135,15 +135,15 @@ class IPAddr {
                        return implode(".", $ipv4);
                }
        }
                        return implode(".", $ipv4);
                }
        }

-       
+

        public function getNumeric() {
        public function getNumeric() {

-               if($this->isIPv6()) {   
+               if($this->isIPv6()) {

                        $max_start = 0;
                        $max_zeros = 0;
                        $curr_zeros = 0;
                        for ($i = 0; $i < 8; $i++) {
                                if ($this->ip6[$i] == 0)
                        $max_start = 0;
                        $max_zeros = 0;
                        $curr_zeros = 0;
                        for ($i = 0; $i < 8; $i++) {
                                if ($this->ip6[$i] == 0)

-                                       $curr_zeros++;
+                               $curr_zeros++;

                                else if ($curr_zeros > $max_zeros) {
                                        $max_start = $i - $curr_zeros;
                                        $max_zeros = $curr_zeros;
                                else if ($curr_zeros > $max_zeros) {
                                        $max_start = $i - $curr_zeros;
                                        $max_zeros = $curr_zeros;


@@ -171,7 +171,7 @@ class IPAddr {
                        return $ipv4[0].$ipv4[1];
                }
        }
                        return $ipv4[0].$ipv4[1];
                }
        }

-       
+

 }
 
 ?>
\ No newline at end of file
 }
 
 ?>
\ No newline at end of file