X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FNumerics.class.php;h=7cd007a398774ad87bc26e5b45f82ff5e9ac31bc;hp=4727dcf2756ab75fbbd77e130f7efe68bee1de8f;hb=8be3a6c1707de83881176d789145a6c175e35dc2;hpb=8fc32c585446865b73c89859c35d1387fadbf9af

diff --git a/Uplink/Numerics.class.php b/Uplink/Numerics.class.php
index 4727dcf..7cd007a 100644
--- a/Uplink/Numerics.class.php
+++ b/Uplink/Numerics.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,26 +13,14 @@
  * 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/Numerics.class.php
  *
  * P10 numeric functions
  *
- ************************************************************************
- * accessable functions
- *
- * static String intToNum(int $int, int $length)
- *     returns the numeric representing $int
- *
- * static int numToInt(String $numeric)
- *     returns the integer value, the numeric represents
- *
- * static String parseIP(String $numeric)
- *     parses an IP Address in numeric format
  */
 
 class Numerics {
@@ -45,11 +31,8 @@ class Numerics {
 	  'w','x','y','z','0','1','2','3','4','5','6','7','8','9','[',']'
 	);
 	private static $base64charsLength = 64;
-	
+
 	public static function intToNum($int, $length) {
-		//fix a small "bug": normaly 0 = AAAAA but we need 1 = AAAAA
-		$int = $int - 1;
-		
 		$numeric = "";
 		for($pos = $length-1; $pos >= 0; $pos--) {
 			//current position represents floor($int / ($base64charsLength ^ $pos))
@@ -58,57 +41,25 @@ class Numerics {
 				$base = $base * self::$base64charsLength;
 			}
 			$posValue = floor($int / $base);
+			$int -= $posValue * $base;
 			//get the char representing $posValue
 			$posChar = self::$base64chars[$posValue];
 			$numeric .= $posChar;
 		}
-		
 		return $numeric;
 	}
-	
+
 	public static function numToInt($numeric) {
 		$base = 1;
 		$int = 0;
 		for($pos = strlen($numeric)-1; $pos >= 0; $pos--) {
 			$posValue = array_search($numeric[$pos], self::$base64chars);
-			$int = ($posValue * $base);
+			$int += ($posValue * $base);
 			$base = $base * self::$base64charsLength;
 		}
-		
-		//fix a small "bug": normaly 0 = AAAAA but we need 1 = AAAAA
-		$int = $int + 1;
-		
 		return $int;
 	}
-	
-	public static function parseIP($numeric) {
-		if(strlen($numeric) == 6) { //IPv4
-			$value = self::numToInt($numeric);
-			$ip = array();
-			$ip[0] = ($value & 0xff000000) >> 24;
-			$ip[1] = ($value & 0x00ff0000) >> 16;
-			$ip[2] = ($value & 0x0000ff00) >> 8;
-			$ip[3] = ($value & 0x000000ff);
-			return implode(".", $ip);
-		} else { //IPv6
-			$ip = array();
-			for($i = 0; $i < strlen($numeric);) {
-				if($numeric[$i] == "_") {
-					$rightBlocks = (strlen($numeric) - ($i + 1)) / 3;
-					$skipCount = 8 - count($ip) - $rightBlocks;
-					for($j = 0; $j < $skipBlocks; $j++) {
-						$ip[] = "0";
-					}
-				} else {
-					$value = self::numToInt($numeric[$i].$numeric[$i+1].$numeric[$i+2]);
-					$ip[] = dechex($value);
-					$i += 3;
-				}
-			}
-			return implode(":", $ip);
-		}
-	}
-	
+
 }
 
 ?>
\ No newline at end of file