some fixes

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

diff --git a/Uplink/Numerics.class.php b/Uplink/Numerics.class.php
index 4727dcf2756ab75fbbd77e130f7efe68bee1de8f..87cb6426f191b65bb67742ef8b96ebf434313ad5 100644 (file)
--- a/Uplink/Numerics.class.php
+++ b/Uplink/Numerics.class.php
@@ -35,6 +35,9 @@
  *
  * static String parseIP(String $numeric)
  *     parses an IP Address in numeric format
+ *
+ * static String numericFromIP(String $ip)
+ *     builds a numeric representing the IP
  */
 
 class Numerics {
@@ -47,9 +50,6 @@ class Numerics {
        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))
@@ -74,41 +74,9 @@ class Numerics {
                        $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