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

[platal.git] / include / xnet / page.inc.php

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 1b79379..a1af5e5 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -61,15 +61,15 @@ class XnetPage extends PlatalPage
         $sub = array();
         $sub['accueil']           = '';
         $sub['liste des groupes'] = 'plan';
-        if (logged()) {
-            if (has_perms()) {
+        if (S::logged()) {
+            if (S::has_perms()) {
                 $sub['admin X.net'] = 'admin';
             }
             $sub['déconnexion']   = 'exit';
         }
         $menu["Menu Principal"]   = $sub;
 
-        if (logged() && (is_member() || may_update())) {
+        if (S::logged() && (is_member() || may_update())) {
             $sub = array();
             $dim = $globals->asso('diminutif');
             $sub['présentation'] = "$dim/";
@@ -79,26 +79,24 @@ class XnetPage extends PlatalPage
                     $sub['carte'] = "$dim/geoloc.php";
             }
             if ($globals->asso('mail_domain')) {
-                $sub['listes de diffusion'] = "$dim/listes.php";
+                $sub['listes de diffusion'] = "$dim/lists";
             }
-            $sub['événement'] = "$dim/evenements.php";
+            $sub['événement'] = "$dim/events";
             if (false) {
                 $sub['carnet'] = "$dim/carnet.php";
             }
-            $sub['télépaiement'] = "$dim/telepaiement.php";
+            $sub['télépaiement'] = "$dim/paiement";
 
             $menu[$globals->asso('nom')] = $sub;
         }
 
-        if (logged() && may_update()) {
+        if (S::logged() && may_update()) {
             $sub = array();
             $sub['modifier l\'accueil'] = "$dim/edit";
-            if ($globals->wiki->wikidir && $globals->xnet->wiki)
-                $sub['wiki'] = "$dim/Accueil";
             if ($globals->asso('mail_domain')) {
-                $sub['envoyer un mail']     = "$dim/mail.php";
-                $sub['créer une liste']     = "$dim/listes-create.php";
-                $sub['créer un alias']      = "$dim/alias-create.php";
+                $sub['envoyer un mail']     = "$dim/mail";
+                $sub['créer une liste']     = "$dim/lists/create";
+                $sub['créer un alias']      = "$dim/alias/create";
             }
             $menu['Administrer Groupe'] = $sub;
         }
@@ -114,11 +112,11 @@ class XnetPage extends PlatalPage
         $this->register_function('list_all_my_groups', 'list_all_my_groups');
         $this->register_modifier('cat_pp', 'cat_pp');
         $this->assign('it_is_xnet', true);
-        if (!logged() && $force) {
-            $_SESSION['session']->doLogin($this);
+        if (!S::logged() && $force) {
+            XnetSession::doLogin($this);
         }
-        if (!logged() && Get::has('auth')) {
-            $_SESSION['session']->doAuthX($this);
+        if (!S::logged() && Get::has('auth')) {
+            XnetSession::doAuthX($this);
         }
     }