X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fxnet.php;h=c36cf59bd628f47ea246b4d5a29072cc7ba239d5;hb=096f0dca3a94c949b4fc3b917a1c145ea2edd839;hp=7b7c0a95bda0a67cfc43aa776647dce888eb11c1;hpb=2e94d2b81ecadfd32bea9e45a8f6cf938c877f7f;p=platal.git diff --git a/modules/xnet.php b/modules/xnet.php index 7b7c0a9..c36cf59 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -25,15 +25,9 @@ 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), - '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), @@ -46,75 +40,42 @@ class XnetModule extends PLModule $page->changeTpl('xnet/index.tpl'); } - function handler_exit(&$page) - { - XnetSession::destroy(); - $page->changeTpl('xnet/deconnexion.tpl'); - $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) + function handler_login(&$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(); + pl_redirect(''); } - function handler_manuel(&$page) + function handler_exit(&$page) { - $page->changeTpl('xnet/manuel.tpl'); + XnetSession::destroy(); + $page->changeTpl('xnet/deconnexion.tpl'); $page->useMenu(); } function handler_admin(&$page) { - global $globals; - new_admin_page('xnet/admin.tpl'); $page->useMenu(); if (Get::has('del')) { - $res = $globals->xdb->query('SELECT id, nom, mail_domain + $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')) { - $globals->xdb->query('DELETE FROM groupex.membres WHERE asso_id={?}', $id); + XDB::query('DELETE FROM groupex.membres WHERE asso_id={?}', $id); $page->trig('membres supprimés'); if ($domain) { - $globals->xdb->query('DELETE FROM virtual_domains WHERE domain={?}', $domain); - $globals->xdb->query('DELETE FROM virtual, virtual_redirect + XDB::query('DELETE FROM virtual_domains WHERE domain={?}', $domain); + XDB::query('DELETE FROM virtual, virtual_redirect USING virtual INNER JOIN virtual_redirect USING (vid) WHERE alias LIKE {?}', '%@'.$domain); $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); @@ -123,7 +84,7 @@ class XnetModule extends PLModule } } - $globals->xdb->query('DELETE FROM groupex.asso WHERE id={?}', $id); + XDB::query('DELETE FROM groupex.asso WHERE id={?}', $id); $page->trig("Groupe $nom supprimé"); Get::kill('del'); } @@ -133,24 +94,22 @@ class XnetModule extends PLModule } if (Post::has('diminutif')) { - $globals->xdb->query('INSERT INTO groupex.asso (id,diminutif) - VALUES(NULL,{?})', Post::get('diminutif')); - redirect(Post::get('diminutif').'/edit'); + XDB::query('INSERT INTO groupex.asso (id,diminutif) + VALUES(NULL,{?})', Post::v('diminutif')); + pl_redirect('../'.Post::v('diminutif').'/edit'); } - $res = $globals->xdb->query('SELECT nom,diminutif FROM groupex.asso ORDER by NOM'); + $res = XDB::query('SELECT nom,diminutif FROM groupex.asso ORDER by NOM'); $page->assign('assos', $res->fetchAllAssoc()); } function handler_plan(&$page) { - global $globals; - $page->changeTpl('xnet/plan.tpl'); $page->setType('plan'); - $res = $globals->xdb->iterator( + $res = XDB::iterator( 'SELECT dom.id, dom.nom as domnom, asso.diminutif, asso.nom FROM groupex.dom INNER JOIN groupex.asso ON dom.id = asso.dom @@ -160,7 +119,7 @@ class XnetModule extends PLModule while ($tmp = $res->next()) { $groupesx[$tmp['id']][] = $tmp; } $page->assign('groupesx', $groupesx); - $res = $globals->xdb->iterator( + $res = XDB::iterator( 'SELECT dom.id, dom.nom as domnom, asso.diminutif, asso.nom FROM groupex.dom INNER JOIN groupex.asso ON dom.id = asso.dom @@ -170,30 +129,29 @@ class XnetModule extends PLModule while ($tmp = $res->next()) { $binets[$tmp['id']][] = $tmp; } $page->assign('binets', $binets); - $res = $globals->xdb->iterator( + $res = XDB::iterator( 'SELECT asso.diminutif, asso.nom FROM groupex.asso WHERE cat LIKE "%Promotions%" ORDER BY diminutif'); $page->assign('promos', $res); - $res = $globals->xdb->iterator( + $res = XDB::iterator( 'SELECT asso.diminutif, asso.nom FROM groupex.asso 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) { - global $globals; - if (!$cat) { $this->handler_index(&$page); } @@ -204,22 +162,23 @@ class XnetModule extends PLModule $page->assign('cat', $cat); $page->assign('dom', $dom); - $res = $globals->xdb->query("SELECT id,nom FROM groupex.dom - WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat); + $res = XDB::query("SELECT id,nom FROM groupex.dom + WHERE FIND_IN_SET({?}, cat) + ORDER BY nom", $cat); $doms = $res->fetchAllAssoc(); $page->assign('doms', $doms); if (empty($doms)) { - $res = $globals->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 = $globals->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);