Merge

--HG--
branch : quitta-gsoc-2013

code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php

@@ -123,7 +123,8 @@ class Helpers{
                     $statement = $dbr->execute("SELECT * FROM ring_users WHERE user_id=:id AND cookie =:cookie", array('id' => $id, 'cookie' => $_COOKIE['ryzomId']));
                     if ($statement->rowCount() ){
                          $entry = $statement->fetch();
-                         return array('id' => $id, 'name' => $entry['user_name']); 
+			//print_r($entry);
+                         return array('id' => $entry['user_id'], 'name' => $entry['user_name']); 
                     }else{
                          return "FALSE";
                     }

code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php

@@ -6,11 +6,11 @@ function login(){
 		if( $result != "FALSE"){
 			//handle successful login
 			$_SESSION['user'] = $result['name'];
-			$_SESSION['id'] = WebUsers::getId($result['id']);
+			$_SESSION['id'] = WebUsers::getId($result['name']);
 			$_SESSION['ticket_user'] = Ticket_User::constr_ExternId($_SESSION['id']);
 			//go back to the index page.
 			header( 'Location: index.php' );
 			exit;
 		}
 	}
-}
+}