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 7cb4fb577553ea05a8975b521cead8a02de13b04..7cd007a398774ad87bc26e5b45f82ff5e9ac31bc 100644 (file)
--- a/Uplink/Numerics.class.php
+++ b/Uplink/Numerics.class.php
@@ -1,12 +1,12 @@
 <?php
 /******************************* PHP-P10 v2 *****************************
- * Copyright (C) 2011  Philipp Kreil (pk910)                            *
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)                       *
  *                                                                      *
  * 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 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        *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  Uplink/Numerics.class.php
  *
  * P10 numeric functions
@@ -31,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--) {
@@ -46,21 +46,20 @@ class Numerics {
                        $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