From 374487239a72c7b2a083c5b9d8f2a53aec74ac80 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Mon, 18 Sep 2006 20:13:11 +0000
Subject: [PATCH] merge

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@861 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 modules/auth/auth.inc.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index dbc50f7..498bd3b 100644
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -36,8 +36,10 @@ function gpex_make_auth($chlg, $privkey, $datafields) {
         /* on verifie qu'on n'a pas demandé une variable inexistante ! */
         if (S::has($val)) {
             $tohash .= S::v($val);
+            $params .= "&$val=".S::v($val);
         } else if (isset($personnal_data[$val])) {
             $tohash .= $personnal_data[$val];
+            $params .= "&$val=".$personnal_data[$val];
         } else if ($val == 'username') {
             $res = XDB::query("SELECT alias FROM aliases
                                           WHERE id = {?} AND FIND_IN_SET('bestalias', flags)",
@@ -55,11 +57,11 @@ function gpex_make_params($chlg, $privkey, $datafields) {
     $params   = "&auth=".gpex_make_auth($chlg, $privkey, $datafields);
 
     $res = XDB::query("SELECT matricule, matricule_ax, promo,
-                                        promo_sortie, flags, deces, nom,
-                                        prenom, nationalite, section,
-                                        naissance
-                                   FROM auth_user_md5 WHERE user_id = {?}",
-                                S::v('uid'));
+                              promo_sortie, flags, deces, nom,
+                              prenom, nationalite, section,
+                              naissance
+                         FROM auth_user_md5 WHERE user_id = {?}",
+                      S::v('uid'));
     $personnal_data = $res->fetchOneAssoc();
 
     $fieldarr = explode(",",$datafields);
@@ -67,7 +69,9 @@ function gpex_make_params($chlg, $privkey, $datafields) {
     foreach ($fieldarr as $val) {
         if (S::has($val)) {
             $tohash .= S::v($val);
+            $params .= "&$val=".S::v($val);
         } else if (isset($personnal_data[$val])) {
+            $tohash .= $personnal_data[$val];
             $params .= "&$val=".$personnal_data[$val];
         } else if ($val == 'username') {
             $res = XDB::query("SELECT alias FROM aliases 
-- 
2.1.4