Merge commit 'origin/platal-0.10.0'

[platal.git] / modules / auth / auth.inc.php

diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index 9f30d32..aae0553 100644 (file)
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -41,9 +41,11 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
     $personnal_data = $res->fetchOneAssoc();
 
     foreach ($fieldarr as $val) {
-        /* on verifie qu'on n'a pas demandé une variable inexistante ! */
+        // Determine the requested value, and add it to the answer.
         if ($val == 'perms') {
             $params .= gpex_prepare_param($val, S::has_perms() ? 'admin' : 'user', $tohash, $charset);
+        } else if ($val == 'forlife') {
+            $params .= gpex_prepare_param($val, S::v('hruid'), $tohash, $charset);
         } else if (S::has($val)) {
             $params .= gpex_prepare_param($val, S::v($val), $tohash, $charset);
         } else if (isset($personnal_data[$val])) {
@@ -62,9 +64,6 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
                                     WHERE  uid = {?} AND diminutif = {?}",
                                   S::v('uid'), $_GET['group']);
                 $perms = $res->fetchOneCell();
-                if (S::has_perms()) {
-                    $perms = 'admin';
-                }
             } else {
                 // if no group asked, return main rights
                 $perms = S::has_perms() ? 'admin' : 'membre';