X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnet.php;h=fc4536599be10dd382662509972477dc1df9df50;hb=d3c52d3044db7080cb9226ee1bf55a1409b924e2;hp=1b368ebb94245ebd9987a93ba73106bf6bf28207;hpb=a3a049fc80d3707bcc76903ab89f73974c470c0c;p=platal.git

diff --git a/modules/xnet.php b/modules/xnet.php
index 1b368eb..fc45365 100644
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -27,13 +27,6 @@ class XnetModule extends PLModule
             'index'     => $this->make_hook('index',     AUTH_PUBLIC),
             'exit'      => $this->make_hook('exit',      AUTH_PUBLIC),
 
-            'about'     => $this->make_hook('about',     AUTH_PUBLIC),
-            'article12' => $this->make_hook('article12', AUTH_PUBLIC),
-            'article16' => $this->make_hook('article16', AUTH_PUBLIC),
-            'creategpx' => $this->make_hook('creategpx', AUTH_PUBLIC),
-            'services'  => $this->make_hook('services',  AUTH_PUBLIC),
-            'manuel'    => $this->make_hook('manuel',    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),
@@ -53,42 +46,6 @@ class XnetModule extends PLModule
         $page->useMenu();
     }
 
-    function handler_about(&$page)
-    {
-        $page->changeTpl('xnet/apropos.tpl');
-        $page->useMenu();
-    }
-
-    function handler_article12(&$page)
-    {
-        $page->changeTpl('xnet/article12.tpl');
-        $page->useMenu();
-    }
-
-    function handler_article16(&$page)
-    {
-        $page->changeTpl('xnet/article16.tpl');
-        $page->useMenu();
-    }
-
-    function handler_creategpx(&$page)
-    {
-        $page->changeTpl('xnet/creation-groupex.tpl');
-        $page->useMenu();
-    }
-
-    function handler_services(&$page)
-    {
-        $page->changeTpl('xnet/services.tpl');
-        $page->useMenu();
-    }
-
-    function handler_manuel(&$page)
-    {
-        $page->changeTpl('xnet/manuel.tpl');
-        $page->useMenu();
-    }
-
     function handler_admin(&$page)
     {
         new_admin_page('xnet/admin.tpl');
@@ -97,7 +54,7 @@ class XnetModule extends PLModule
         if (Get::has('del')) {
             $res = XDB::query('SELECT id, nom, mail_domain
                                            FROM groupex.asso WHERE diminutif={?}',
-                                        Get::get('del'));
+                                        Get::v('del'));
             list($id, $nom, $domain) = $res->fetchOneRow();
             $page->assign('nom', $nom);
             if ($id && Post::has('del')) {
@@ -112,7 +69,7 @@ class XnetModule extends PLModule
                     $page->trig('suppression des alias mails');
 
                     require_once('lists.inc.php');
-                    $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $domain);
+                    $client =& lists_xmlrpc(S::v('uid'), S::v('password'), $domain);
                     if ($listes = $client->get_lists()) {
                         foreach ($listes as $l) {
                             $client->delete_list($l['list'], true);
@@ -132,8 +89,8 @@ class XnetModule extends PLModule
 
         if (Post::has('diminutif')) {
             XDB::query('INSERT INTO groupex.asso (id,diminutif)
-                                 VALUES(NULL,{?})', Post::get('diminutif'));
-            redirect(Post::get('diminutif').'/edit');
+                                 VALUES(NULL,{?})', Post::v('diminutif'));
+            pl_redirect('../'.Post::v('diminutif').'/edit');
         }
 
         $res = XDB::query('SELECT nom,diminutif FROM groupex.asso ORDER by NOM');
@@ -179,11 +136,12 @@ class XnetModule extends PLModule
                   WHERE  FIND_IN_SET("Institutions", cat)
                ORDER BY  diminutif');
         $page->assign('inst', $res);
+        $page->useMenu();
     }
 
     function handler_groups2(&$page)
     {
-        $this->handler_groups(&$page, Get::get('cat'), Get::get('dom'));
+        $this->handler_groups(&$page, Get::v('cat'), Get::v('dom'));
     }
 
     function handler_groups(&$page, $cat = null, $dom = null)
@@ -199,21 +157,22 @@ class XnetModule extends PLModule
         $page->assign('dom', $dom);
 
         $res  = XDB::query("SELECT id,nom FROM groupex.dom
-                                       WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat);
+                             WHERE FIND_IN_SET({?}, cat)
+                          ORDER BY nom", $cat);
         $doms = $res->fetchAllAssoc();
         $page->assign('doms', $doms);
 
         if (empty($doms)) {
-            $res = XDB::iterator("SELECT diminutif, nom FROM groupex.asso
-                                             WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat);
+            $res = XDB::query("SELECT diminutif, nom FROM groupex.asso
+                                   WHERE FIND_IN_SET({?}, cat)
+                                ORDER BY nom", $cat);
+            $page->assign('gps', $res->fetchAllAssoc());
         } elseif (!is_null($dom)) {
-            $res = XDB::iterator("SELECT diminutif, nom FROM groupex.asso
-                                             WHERE FIND_IN_SET({?}, cat) AND dom={?}
-                                          ORDER BY nom", $cat, $dom);
-        } else {
-            $res = null;
+            $res = XDB::query("SELECT diminutif, nom FROM groupex.asso
+                                WHERE FIND_IN_SET({?}, cat) AND dom={?}
+                             ORDER BY nom", $cat, $dom);
+            $page->assign('gps', $res->fetchAllAssoc());
         }
-        $page->assign('gps', $res);
 
         $page->useMenu();
         $page->setType($cat);