From 0aa0d3a82f108162d0d18e6d5c020ebdba4133ab Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Sun, 26 Sep 2010 23:10:23 +0200
Subject: [PATCH] fix groupex auth - promo is only the entry year

---
 ChangeLog                 | 2 +-
 modules/auth/auth.inc.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 961212f..26c8187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@ From 1.0.0 branch:
         - Fix unsubscription                                               -XEL
 
     * Auth:
-        - Fix GroupeX auth (using french fields)                           -Car
+        - #1246: Fix GroupeX auth                                          -Car
 
     * Carnet:
         - Fix inaccessible carnet/panel in case of profile update          -FRU
diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index 1cb1ca4..186506a 100644
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -36,9 +36,11 @@ 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'];
-- 
2.1.4