fixed Numerics::numToInt method && tidied up code

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

diff --git a/Uplink/Numerics.class.php b/Uplink/Numerics.class.php
index 87cb6426f191b65bb67742ef8b96ebf434313ad5..7cd007a398774ad87bc26e5b45f82ff5e9ac31bc 100644 (file)
--- 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,29 +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
- *
- * static String numericFromIP(String $ip)
- *     builds a numeric representing the IP
  */
 
 class Numerics {
@@ -48,7 +31,7 @@ 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) {
                $numeric = "";
                for($pos = $length-1; $pos >= 0; $pos--) {
@@ -58,25 +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;
                }
                return $int;
        }
-       
+
 }
 
 ?>
\ No newline at end of file