X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FNumerics.class.php;h=3de23e13061418b6aae8c8b101ef520b472e8880;hp=55db20977a6b0ecc3042f3def2753f4a984bb0b0;hb=811bc0c7a1f583fb624a0f8c3601146e063c5a25;hpb=d50b17d7f0ebc21c1c70f2ba513e0973ce9fc789

diff --git a/Uplink/Numerics.class.php b/Uplink/Numerics.class.php
index 55db209..3de23e1 100644
--- a/Uplink/Numerics.class.php
+++ b/Uplink/Numerics.class.php
@@ -1,22 +1,19 @@
 <?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,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
  * 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/>. *
  *                                                                      *
  ************************************************************************
  * 
@@ -24,14 +21,6 @@
  *
  * 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
  */
 
 class Numerics {
@@ -44,9 +33,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))
@@ -55,6 +41,7 @@ class Numerics {
 				$base = $base * self::$base64charsLength;
 			}
 			$posValue = floor($int / $base);
+			$int -= $posValue * $base;
 			//get the char representing $posValue
 			$posChar = self::$base64chars[$posValue];
 			$numeric .= $posChar;
@@ -71,10 +58,6 @@ 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;
 	}