pending commit, finished during MQ/S download ...

[platal.git] / include / xorg / menu.inc.php

diff --git a/include/xorg/menu.inc.php b/include/xorg/menu.inc.php
index 94139c5..41c9e45 100644 (file)
--- a/include/xorg/menu.inc.php
+++ b/include/xorg/menu.inc.php
@@ -56,18 +56,16 @@ class XOrgMenu
 
     function XOrgMenu()
     {
-        global $globals;
-        
-        $this->_int[XOM_NO]       = Array();
-        $this->_int[XOM_CUSTOM]   = Array();
-        $this->_int[XOM_SERVICES] = Array();
-        $this->_int[XOM_GROUPS]   = Array();
-        $this->_int[XOM_INFOS]    = Array();
-        $this->_int[XOM_ADMIN]    = Array();
-
-        $this->_ext[XOM_US]       = Array();
-        $this->_ext[XOM_EXT]      = Array();
-        $this->_ext[XOM_INFOS]    = Array();
+        $this->_int[XOM_NO]       = array();
+        $this->_int[XOM_CUSTOM]   = array();
+        $this->_int[XOM_SERVICES] = array();
+        $this->_int[XOM_GROUPS]   = array();
+        $this->_int[XOM_INFOS]    = array();
+        $this->_int[XOM_ADMIN]    = array();
+
+        $this->_ext[XOM_US]       = array();
+        $this->_ext[XOM_EXT]      = array();
+        $this->_ext[XOM_INFOS]    = array();
     }
 
     // }}}
@@ -91,13 +89,13 @@ class XOrgMenu
 
     function menu()
     {
-        $res = logged() ? $this->_int : $this->_ext;
-        if (identified()) {
+        $res = S::logged() ? $this->_int : $this->_ext;
+        if (S::identified()) {
             $res[XOM_NO][] = Array(0, 'text' => 'Déconnexion', 'url' => 'exit');
         } elseif (Cookie::has('ORGaccess')) {
             $res[XOM_NO][] = Array(0, 'text' => 'Déconnexion totale', 'url' => 'exit/forget');
         }
-        if (!has_perms()) {
+        if (!S::has_perms()) {
             unset($res[XOM_ADMIN]);
         }
         foreach (array_keys($res) as $key) {