X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=Uplink%2FIPAddr.class.php;h=1eddcbed0aa7f872ff688d122121426430ffd534;hb=f37602484b52f7c99bafdf506b83349adbc0763c;hp=e486fb0caa787509382a2721daed3eb5e29dcf26;hpb=d366927546c9ab2a52f6f87cf96aa3a4e6fd5cbb;p=PHP-P10.git

diff --git a/Uplink/IPAddr.class.php b/Uplink/IPAddr.class.php
index e486fb0..1eddcbe 100644
--- a/Uplink/IPAddr.class.php
+++ b/Uplink/IPAddr.class.php
@@ -1,12 +1,10 @@
 <?php
-/********************************* PHP-P10 ******************************
- *    P10 uplink class by pk910   (c)2011 pk910                         *
- ************************************************************************
- *                          Version 2 (OOP)                             *
+/******************************* PHP-P10 v2 *****************************
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)                       *
  *                                                                      *
- * PHP-P10 is free software; you can redistribute it and/or modify      *
+ * This program is free software: you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
+ * 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,      *
@@ -15,11 +13,10 @@
  * GNU General Public License for more details.                         *
  *                                                                      *
  * You should have received a copy of the GNU General Public License    *
- * along with PHP-P10; if not, write to the Free Software Foundation,   *
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.       *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  Uplink/IpAddr.class.php
  *
  * This class represents an IPv4 or IPv6 address.
@@ -31,10 +28,10 @@ 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;
-	
+
 	public function __construct($initial_value) {
 		for($i = 0; $i < 8; $i++) {
-			$ip6[$i] = 0;
+			$this->ip6[$i] = 0;
 		}
 		if($initial_value == null) {
 			//nothing
@@ -46,7 +43,7 @@ class IPAddr {
 			$this->parseNumeric($initial_value);
 		}
 	}
-	
+
 	public function parseNumeric($numeric) {
 		if(strlen($numeric) == 6) { //IPv4
 			$value = Numerics::numToInt($numeric);
@@ -67,9 +64,10 @@ class IPAddr {
 					$i += 3;
 				}
 			}
+			$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);
@@ -83,28 +81,30 @@ class IPAddr {
 				$this->ip6[$j++] = hexdec($block);
 			}
 		}
+		$this->addr_is_ipv6 = true;
 	}
-	
+
 	public function parseIPv4($ipv4) {
 		$ipv4blocks = explode(".",$ipv4);
 		$this->ip6[6] = intval($ipv4blocks[0]) << 8;
 		$this->ip6[6] |= intval($ipv4blocks[1]);
 		$this->ip6[7] = intval($ipv4blocks[2]) << 8;
 		$this->ip6[7] |= intval($ipv4blocks[3]);
+		$this->addr_is_ipv6 = false;
 	}
-	
+
 	public function isIPv6() {
 		return $this->addr_is_ipv6;
 	}
-	
+
 	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)
-					$curr_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);
 		}
 	}
-	
+
 	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)
-					$curr_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];
 		}
 	}
-	
+
 }
 
 ?>
\ No newline at end of file