Fix session bootstrap

[platal.git] / modules / xnet.php

diff --git a/modules/xnet.php b/modules/xnet.php
index 2116744..7d73eb2 100644 (file)
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -25,14 +25,12 @@ class XnetModule extends PLModule
     {
         return array(
             'index'     => $this->make_hook('index',     AUTH_PUBLIC),
-            'login'     => $this->make_hook('login',     AUTH_MDP),
             'exit'      => $this->make_hook('exit',      AUTH_PUBLIC),
 
             'admin'     => $this->make_hook('admin',     AUTH_MDP, 'admin'),
             'groups'    => $this->make_hook('groups',    AUTH_PUBLIC),
             'groupes.php' => $this->make_hook('groups2', AUTH_PUBLIC),
             'plan'      => $this->make_hook('plan',      AUTH_PUBLIC),
-            'send_bug'  => $this->make_hook('bug',       AUTH_MDP),
             'photo'     => $this->make_hook('photo',     AUTH_MDP),
         );
     }
@@ -57,21 +55,6 @@ class XnetModule extends PLModule
         }
         exit;
     }
-
-    function handler_bug(&$page)
-    {
-        $page->changeTpl('bug.tpl',SIMPLE);
-        $page->addJsLink('close_on_esc.js');
-        if (Env::has('send')) {
-            $page->assign('bug_sent',1);
-            $mymail = new PlMailer();
-            $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@polytechnique.org>');
-            $mymail->addTo('support+platal@polytechnique.org');
-            $mymail->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary'));
-            $mymail->setTxtBody(Env::v('detailed_desc'));
-            $mymail->send();
-        }
-    }
     
     function handler_index(&$page)
     {
@@ -79,25 +62,11 @@ class XnetModule extends PLModule
         $page->changeTpl('xnet/index.tpl');
     }
 
-    function handler_login(&$page)
-    {
-        $allkeys = func_get_args();
-        unset($allkeys[0]);
-        $url = join('/',$allkeys);
-        pl_redirect($url);
-    }
-
     function handler_exit(&$page)
     {
-        if (S::has('suid')) {
-            $suid = S::v('suid');
-            $_SESSION['perms'] = $suid['perms'];
-            S::kill('suid');
-        } else {
-            XnetSession::destroy();
-            $page->changeTpl('xnet/deconnexion.tpl');
-        }
-        pl_redirect('/');
+        XnetSession::killSuid();
+        XnetSession::destroy();
+        $page->changeTpl('xnet/deconnexion.tpl');
     }
 
     function handler_admin(&$page)
@@ -112,7 +81,7 @@ class XnetModule extends PLModule
             $page->assign('nom', $nom);
             if ($id && Post::has('del')) {
                 XDB::query('DELETE FROM groupex.membres WHERE asso_id={?}', $id);
-                $page->trig('membres supprimés');
+                $page->trig('membres supprimés');
 
                 if ($domain) {
                     XDB::query('DELETE FROM  virtual_domains WHERE domain={?}', $domain);
@@ -126,12 +95,12 @@ class XnetModule extends PLModule
                         foreach ($listes as $l) {
                             $mmlist->delete_list($l['list'], true);
                         }
-                        $page->trig('mail lists surpprimées');
+                        $page->trig('mail lists surpprimées');
                     }
                 }
 
                 XDB::query('DELETE FROM groupex.asso WHERE id={?}', $id);
-                $page->trig("Groupe $nom supprimé");
+                $page->trig("Groupe $nom supprimé");
                 Get::kill('del');
             }
             if (!$id) {
@@ -229,4 +198,5 @@ class XnetModule extends PLModule
     }
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>