Merge commit 'origin/fusionax' into account

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

diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index c158ff2..6febc2c 100644 (file)
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -50,7 +50,7 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
     foreach ($fieldarr as $val) {
         // 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);
+            $params .= gpex_prepare_param($val, S::admin() ? 'admin' : 'user', $tohash, $charset);
         } else if ($val == 'forlife') {
             $params .= gpex_prepare_param($val, S::v('hruid'), $tohash, $charset);
         } else if (S::has($val)) {
@@ -74,7 +74,7 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
                 $perms = $res->fetchOneCell();
             } else {
                 // if no group asked, return main rights
-                $perms = S::has_perms() ? 'admin' : 'membre';
+                $perms = S::admin() ? 'admin' : 'membre';
             }
             $params .= gpex_prepare_param($val, $perms, $tohash, $charset);
         } else {