X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth%2Fauth.inc.php;h=a443af85a6d1e5fe3074b131b112590ae84c8537;hb=83a423c28654d9880484a8faa1e5736d580ea217;hp=383745a815ce734d8247d1e60027e7c3372727f2;hpb=ed92ea696e042eb9b2d0efcc4731fdf89fb17924;p=platal.git

diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index 383745a..a443af8 100644
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -36,12 +36,16 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
     if ($user->hasProfile()) {
         /* Transition table for authentification. */
         $personnal_data = $user->profile()->data();
+        $personnal_data['full_promo'] = $personnal_data['promo'];
+        $personnal_data['promo'] = $personnal_data['entry_year'];
         $personnal_data['matricule'] = $personnal_data['xorg_id'];
         $personnal_data['matricule_ax'] = $personnal_data['ax_id'];
-        $personnal_data['promo_sortie'] = $personnal_data['promo'] + 3; // FIXME: Hum, not that good
+        $personnal_data['promo_sortie'] = $personnal_data['grad_year'];
         $personnal_data['nationalite'] = $personnal_data['nationality1'];
         $personnal_data['naissance'] = $personnal_data['birthdate'];
         $personnal_data['deces'] = $personnal_data['deathdate'];
+        $personnal_data['nom'] = $personnal_data['lastname'];
+        $personnal_data['prenom'] = $personnal_data['firstname'];
         $personnal_data['flags'] = $user->profile()->isFemale() ? 'femme' : '';
     } else {
         $personnal_data = array();
@@ -58,11 +62,10 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
         } else if (isset($personnal_data[$val])) {
             $params .= gpex_prepare_param($val, $personnal_data[$val], $tohash, $charset);
         } else if ($val == 'username') {
-            $res = XDB::query("SELECT  alias
-                                 FROM  aliases
-                                WHERE  uid = {?} AND FIND_IN_SET('bestalias', flags)",
-                              S::i('uid'));
-            $min_username = $res->fetchOneCell();
+            $min_username = XDB::fetchOneCell('SELECT  email
+                                                 FROM  email_source_account
+                                                WHERE  uid = {?} FIND_IN_SET(\'bestalias\', flags)',
+                                              S::i('uid'));
             $params      .= gpex_prepare_param($val, $min_username, $tohash, $charset);
         } else if ($val == 'grpauth') {
             if (isset($_GET['group'])) {