simplify auth mechanism a bit more

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

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 6b91e9e..cf3df33 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -60,45 +60,43 @@ class XnetPage extends PlatalPage
 
         $sub = array();
         $sub['accueil']           = '';
-        $sub['liste des groupes'] = 'plan.php';
-        if (logged()) {
-            if (has_perms()) {
-                $sub['admin X.net'] = 'admin.php';
+        $sub['liste des groupes'] = 'plan';
+        if (S::logged()) {
+            if (S::has_perms()) {
+                $sub['admin X.net'] = 'admin';
             }
-            $sub['déconnexion']   = 'deconnexion.php';
+            $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/asso.php";
+            $sub['présentation'] = "$dim/";
             if (may_update() || $globals->asso('pub') == 'public') {
-                $sub['annuaire du groupe'] = "$dim/annuaire.php";
+                $sub['annuaire du groupe'] = "$dim/annuaire";
                 if ($globals->xnet->geoloc)
                     $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.php";
-            if ($globals->wiki->wikidir && $globals->xnet->wiki)
-                $sub['wiki'] = "$dim/Accueil";
+            $sub['modifier l\'accueil'] = "$dim/edit";
             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,15 +112,20 @@ 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::doAuth();
         }
-        if (!logged() && Get::has('auth')) {
-            $_SESSION['session']->doAuthX($this);
+        if (!S::logged() && Get::has('auth')) {
+            XnetSession::doAuthX();
         }
     }
 
     // }}}
+
+    function doLogin()
+    {
+        redirect(S::v('loginX'));
+    }
 }
 
 // }}}