X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth%2Fauth.inc.php;h=498bd3bd30634e265592a2bf6bc3e017b58e8ab8;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=2d5aab4a9c87749e4ae57975d1a314b5e4524147;hpb=08cce2ff528b38bde27cdec6d6bc28d6af4a42d4;p=platal.git

diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index 2d5aab4..498bd3b 100644
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -21,7 +21,6 @@
 
 /* cree le champs "auth" renvoye au Groupe X */
 function gpex_make_auth($chlg, $privkey, $datafields) {
-    global $globals;
     $fieldarr = explode(",",$datafields);
     $tohash   = "1$chlg$privkey";
 
@@ -30,19 +29,21 @@ function gpex_make_auth($chlg, $privkey, $datafields) {
                                         prenom, nationalite, section,
                                         naissance
                                    FROM auth_user_md5 WHERE user_id = {?}",
-                                Session::getInt('uid'));
+                                S::v('uid'));
     $personnal_data = $res->fetchOneAssoc();
 
     foreach ($fieldarr as $val) {
         /* on verifie qu'on n'a pas demandé une variable inexistante ! */
-        if (Session::has($val)) {
-            $tohash .= Session::get($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
                                           WHERE id = {?} AND FIND_IN_SET('bestalias', flags)",
-                                        Session::getInt('uid'));
+                                        S::v('uid'));
             $min_username = $res->fetchOneCell();
             $tohash      .= $min_username;
         }
@@ -53,28 +54,29 @@ function gpex_make_auth($chlg, $privkey, $datafields) {
 
 /* cree les parametres de l'URL de retour avec les champs demandes */
 function gpex_make_params($chlg, $privkey, $datafields) {
-    global $globals;
     $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 = {?}",
-                                Session::getInt('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);
 
     foreach ($fieldarr as $val) {
-        if (Session::has($val)) {
-            $tohash .= Session::get($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 
                                           WHERE id = {?} AND FIND_IN_SET('bestalias', flags)",
-                                        Session::getInt('uid'));
+                                        S::v('uid'));
             $min_username = $res->fetchOneCell();
             $params      .= "&$val=".$min_username;
         }