Merge branch 'platal-0.9.16'

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

diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index a1a562f..305e0fc 100644 (file)
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -42,7 +42,9 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
 
     foreach ($fieldarr as $val) {
         /* on verifie qu'on n'a pas demandé une variable inexistante ! */
-        if (S::has($val)) {
+        if ($val == 'perms') {
+            $params .= gpex_prepare_param($val, S::has_perms() ? 'admin' : 'user', $tohash, $charset);
+        } else if (S::has($val)) {
             $params .= gpex_prepare_param($val, S::v($val), $tohash, $charset);
         } else if (isset($personnal_data[$val])) {
             $params .= gpex_prepare_param($val, $personnal_data[$val], $tohash, $charset);
@@ -60,9 +62,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';