X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnet.php;h=e4895a3814f62d01960a667ac2594eeb27fb08f6;hb=d4c08d89b8fb6cd94f2813eb228fe8a0d133a3aa;hp=195d4bb450b9f3df211c0a37cedd0315637c67f3;hpb=59bec5bc5512a4f962ebac7b0346f59cdf56f901;p=platal.git diff --git a/modules/xnet.php b/modules/xnet.php index 195d4bb..e4895a3 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_PUBLIC), - '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), - 'photo' => $this->make_hook('photo', AUTH_MDP), - 'autologin' => $this->make_hook('autologin', AUTH_MDP), + 'index' => $this->make_hook('index', AUTH_PUBLIC), + '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), + 'photo' => $this->make_hook('photo', AUTH_MDP), + 'autologin' => $this->make_hook('autologin', AUTH_MDP), ); } @@ -48,10 +48,10 @@ class XnetModule extends PLModule WHERE alias = {?}", $x); if ((list($type, $data) = $res->fetchOneRow())) { - Header("Content-type: image/$type"); + pl_cached_dynamic_content_headers("image/$type"); echo $data; } else { - Header('Content-type: image/png'); + pl_cached_dynamic_content_headers("image/png"); echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png'); } exit; @@ -76,14 +76,14 @@ class XnetModule extends PLModule if (Get::has('del')) { $res = XDB::query('SELECT id, nom, mail_domain - FROM groupex.asso WHERE diminutif={?}', + FROM groups WHERE diminutif={?}', Get::v('del')); list($id, $nom, $domain) = $res->fetchOneRow(); $page->assign('nom', $nom); if ($id && Post::has('del')) { S::assert_xsrf_token(); - XDB::query('DELETE FROM groupex.membres WHERE asso_id={?}', $id); + XDB::query('DELETE FROM group_members WHERE asso_id={?}', $id); $page->trigSuccess('membres supprimés'); if ($domain) { @@ -102,7 +102,7 @@ class XnetModule extends PLModule } } - XDB::query('DELETE FROM groupex.asso WHERE id={?}', $id); + XDB::query('DELETE FROM groups WHERE id={?}', $id); $page->trigSuccess("Groupe $nom supprimé"); Get::kill('del'); } @@ -111,15 +111,27 @@ class XnetModule extends PLModule } } - if (Post::has('diminutif')) { + if (Post::has('diminutif') && Post::v('diminutif') != "") { S::assert_xsrf_token(); - XDB::query('INSERT INTO groupex.asso (id,diminutif) - VALUES(NULL,{?})', Post::v('diminutif')); - pl_redirect('../'.Post::v('diminutif').'/edit'); + $res = XDB::query('SELECT COUNT(*) + FROM groups + WHERE diminutif = {?}', + Post::v('diminutif')); + + if ($res->fetchOneCell() == 0) { + XDB::execute('INSERT INTO groups (id, diminutif) + VALUES (NULL, {?})', + Post::v('diminutif')); + pl_redirect('../' . Post::v('diminutif') . '/edit'); + } else { + $page->trigError('Le diminutif demandé est déjà pris.'); + } } - $res = XDB::query('SELECT nom,diminutif FROM groupex.asso ORDER by NOM'); + $res = XDB::query('SELECT nom, diminutif + FROM groups + ORDER BY nom'); $page->assign('assos', $res->fetchAllAssoc()); } @@ -130,35 +142,35 @@ class XnetModule extends PLModule $page->setType('plan'); $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 - WHERE FIND_IN_SET("GroupesX", dom.cat) AND FIND_IN_SET("GroupesX", asso.cat) - ORDER BY dom.nom, asso.nom'); + 'SELECT dom.id, dom.nom as domnom, groups.diminutif, groups.nom + FROM group_dom AS dom + INNER JOIN groups ON dom.id = groups.dom + WHERE FIND_IN_SET("GroupesX", dom.cat) AND FIND_IN_SET("GroupesX", groups.cat) + ORDER BY dom.nom, groups.nom'); $groupesx = array(); while ($tmp = $res->next()) { $groupesx[$tmp['id']][] = $tmp; } $page->assign('groupesx', $groupesx); $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 - WHERE FIND_IN_SET("Binets", dom.cat) AND FIND_IN_SET("Binets", asso.cat) - ORDER BY dom.nom, asso.nom'); + 'SELECT dom.id, dom.nom as domnom, groups.diminutif, groups.nom + FROM group_dom AS dom + INNER JOIN groups ON dom.id = groups.dom + WHERE FIND_IN_SET("Binets", dom.cat) AND FIND_IN_SET("Binets", groups.cat) + ORDER BY dom.nom, groups.nom'); $binets = array(); while ($tmp = $res->next()) { $binets[$tmp['id']][] = $tmp; } $page->assign('binets', $binets); $res = XDB::iterator( - 'SELECT asso.diminutif, asso.nom - FROM groupex.asso + 'SELECT diminutif, nom + FROM groups WHERE cat LIKE "%Promotions%" ORDER BY diminutif'); $page->assign('promos', $res); $res = XDB::iterator( - 'SELECT asso.diminutif, asso.nom - FROM groupex.asso + 'SELECT diminutif, nom + FROM groups WHERE FIND_IN_SET("Institutions", cat) ORDER BY diminutif'); $page->assign('inst', $res); @@ -175,27 +187,30 @@ class XnetModule extends PLModule $this->handler_index(&$page); } - $cat = strtolower($cat); + $cat = mb_strtolower($cat); $page->changeTpl('xnet/groupes.tpl'); $page->assign('cat', $cat); $page->assign('dom', $dom); - $res = XDB::query("SELECT id,nom FROM groupex.dom - WHERE FIND_IN_SET({?}, cat) - ORDER BY nom", $cat); + $res = XDB::query("SELECT id,nom + FROM group_dom + WHERE FIND_IN_SET({?}, cat) + ORDER BY nom", $cat); $doms = $res->fetchAllAssoc(); $page->assign('doms', $doms); if (empty($doms)) { - $res = XDB::query("SELECT diminutif, nom, site FROM groupex.asso - WHERE FIND_IN_SET({?}, cat) - ORDER BY nom", $cat); + $res = XDB::query("SELECT diminutif, nom, site + FROM groups + WHERE FIND_IN_SET({?}, cat) + ORDER BY nom", $cat); $page->assign('gps', $res->fetchAllAssoc()); } elseif (!is_null($dom)) { - $res = XDB::query("SELECT diminutif, nom, site FROM groupex.asso - WHERE FIND_IN_SET({?}, cat) AND dom={?} - ORDER BY nom", $cat, $dom); + $res = XDB::query("SELECT diminutif, nom, site + FROM groups + WHERE FIND_IN_SET({?}, cat) AND dom={?} + ORDER BY nom", $cat, $dom); $page->assign('gps', $res->fetchAllAssoc()); } @@ -207,7 +222,7 @@ class XnetModule extends PLModule $allkeys = func_get_args(); unset($allkeys[0]); $url = join('/',$allkeys); - header("Content-type: text/javascript; charset=utf-8"); + pl_content_headers("text/javascript"); echo '$.ajax({ url: "'.$url.'?forceXml=1", dataType: "xml", success: function(xml) { $("body",xml).insertBefore("body"); $("body:eq(1)").remove(); }});'; exit; }