X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=ede566c3ef590d3c9f551067f3f7c4e724b91c05;hb=dcdcd18aeb2b29ddfa7768317b14ca0a277dd654;hp=9098db805bdfed7331cd15a8cdd151255c65b942;hpb=5b21237dd71df96849421c33d87298f15709d0d9;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 9098db8..ede566c 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -41,7 +41,7 @@ function get_infos($email) if ($res->numRows()) { $user = $res->fetchOneAssoc(); if ($user['origine'] == 'X') { - $res = XDB::query("SELECT nom, prenom, promo, FIND_IN_SET(flags, 'femme') AS sexe + $res = XDB::query("SELECT nom, prenom, promo, FIND_IN_SET('femme', flags) AS sexe FROM auth_user_md5 WHERE user_id = {?}", $user['uid']); $user = array_merge($user, $res->fetchOneAssoc()); @@ -55,7 +55,7 @@ function get_infos($email) CONCAT(b.alias, '@m4x.org') AS email, CONCAT(b.alias, '@polytechnique.org') AS email2, m.perms='admin' AS perms, m.origine, - FIND_IN_SET(u.flags, 'femme') AS sexe + FIND_IN_SET('femme', u.flags) AS sexe FROM auth_user_md5 AS u INNER JOIN aliases AS a ON ( u.user_id = a.id AND a.type != 'homonyme' ) INNER JOIN aliases AS b ON ( u.user_id = b.id AND b.type = 'a_vie' ) @@ -79,17 +79,18 @@ class XnetGrpModule extends PLModule '%grp/site' => $this->make_hook('site', AUTH_PUBLIC), '%grp/edit' => $this->make_hook('edit', AUTH_MDP, 'groupadmin'), '%grp/mail' => $this->make_hook('mail', AUTH_MDP, 'groupadmin'), - '%grp/forum' => $this->make_hook('forum', AUTH_MDP), - '%grp/annuaire' => $this->make_hook('annuaire', AUTH_MDP), - '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_MDP), - '%grp/trombi' => $this->make_hook('trombi', AUTH_MDP), + '%grp/forum' => $this->make_hook('forum', AUTH_MDP, 'groupmember'), + '%grp/annuaire' => $this->make_hook('annuaire', AUTH_MDP, 'groupannu'), + '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_MDP, 'groupmember:groupannu'), + '%grp/trombi' => $this->make_hook('trombi', AUTH_MDP, 'groupannu'), + '%grp/geoloc' => $this->make_hook('geoloc', AUTH_MDP, 'groupannu'), '%grp/subscribe' => $this->make_hook('subscribe', AUTH_MDP), - '%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_MDP), + '%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_MDP, 'groupmember'), '%grp/change_rights' => $this->make_hook('change_rights', AUTH_MDP), '%grp/admin/annuaire' - => $this->make_hook('admin_annuaire', AUTH_MDP), + => $this->make_hook('admin_annuaire', AUTH_MDP, 'groupadmin'), '%grp/member' => $this->make_hook('admin_member', AUTH_MDP, 'groupadmin'), @@ -114,8 +115,7 @@ class XnetGrpModule extends PLModule if (!is_null($arg)) { return PL_NOT_FOUND; } - - new_group_open_page('xnetgrp/asso.tpl'); + $page->changeTpl('xnetgrp/asso.tpl'); if (S::logged()) { if (Env::has('read')) { @@ -159,7 +159,7 @@ class XnetGrpModule extends PLModule FROM groupex.announces AS a INNER JOIN auth_user_md5 AS u USING(user_id) WHERE asso_id = {?} AND peremption >= CURRENT_DATE() - AND FIND_IN_SET(a.flags, 'public')", + AND FIND_IN_SET('public', u.flags)", $globals->asso('id')); } @@ -171,7 +171,7 @@ class XnetGrpModule extends PLModule 'rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml'); } - $page->register_modifier('url_catcher', array('MiniWiki','WikiToHTML')); + $page->register_modifier('wiki_to_html', array('MiniWiki','WikiToHTML')); $page->assign('articles', $arts); $page->assign('asso', $globals->asso()); @@ -220,8 +220,7 @@ class XnetGrpModule extends PLModule function handler_edit(&$page) { global $globals; - - new_groupadmin_page('xnetgrp/edit.tpl'); + $page->changeTpl('xnetgrp/edit.tpl'); if (Post::has('submit')) { if (S::has_perms()) { @@ -286,10 +285,11 @@ class XnetGrpModule extends PLModule { global $globals; - new_groupadmin_page('xnetgrp/mail.tpl'); + $page->changeTpl('xnetgrp/mail.tpl'); $mmlist = new MMList(S::v('uid'), S::v('password'), $globals->asso('mail_domain')); $page->assign('listes', $mmlist->get_lists()); + $page->addJsLink('ajax.js'); if (Post::has('send')) { $from = Post::v('from'); @@ -314,7 +314,7 @@ class XnetGrpModule extends PLModule function handler_forum(&$page, $group = null, $artid = null) { global $globals; - new_group_page('xnetgrp/forum.tpl'); + $page->changeTpl('xnetgrp/forum.tpl'); if (!$globals->asso('forum')) { return PL_NOT_FOUND; } @@ -324,10 +324,20 @@ class XnetGrpModule extends PLModule run_banana($page, 'ForumsBanana', $get); } - function handler_annuaire(&$page) + function handler_annuaire(&$page, $action = null, $subaction = null) { global $globals; - new_annu_page('xnetgrp/annuaire.tpl'); + + if ($action == 'geoloc' || $action == 'trombi') { + $view = new UserSet(); + $view->addMod('trombi', 'Trombinoscope'); + $view->addMod('geoloc', 'Planisphère'); + $view->apply('annuaire', $page, $action, $subaction); + if ($action == 'geoloc' && $subaction) { + return; + } + } + $page->changeTpl('xnetgrp/annuaire.tpl'); $sort = Env::v('order'); switch (Env::v('order')) { @@ -427,63 +437,30 @@ class XnetGrpModule extends PLModule $page->jsonAssign('ann', $ann); } - function handler_trombi(&$page, $num = 1) + function handler_trombi(&$page) { - global $globals; - new_annu_page('xnetgrp/trombi.tpl'); - - $page->assign('urlmainsite', "https://www.polytechnique.org/"); - $trombi = new Trombi(array($this, '_trombi_getlist')); - $trombi->hidePromo(); - $trombi->setAdmin(); - $page->assign_by_ref('trombi', $trombi); + pl_redirect('annuaire/trombi'); } - function _trombi_getlist($offset, $limit) + function handler_geoloc(&$page) { - global $globals; - $where = "WHERE m.asso_id= '".addslashes($globals->asso('id'))."'"; - - $res = XDB::query( - "SELECT COUNT(*) - FROM auth_user_md5 AS u - RIGHT JOIN photo AS p ON u.user_id=p.uid - INNER JOIN groupex.membres AS m ON (m.uid = u.user_id) - $where"); - $pnb = $res->fetchOneCell(); - - $res = XDB::query("SELECT promo, user_id, a.alias AS forlife, - IF (nom_usage='', u.nom, nom_usage) AS nom, u.prenom - FROM photo AS p - INNER JOIN auth_user_md5 AS u ON u.user_id=p.uid - INNER JOIN aliases AS a ON ( u.user_id=a.id AND a.type='a_vie' ) - INNER JOIN groupex.membres AS m ON (m.uid = u.user_id) - $where - ORDER BY promo, u.nom, u.prenom LIMIT {?}, {?}", $offset*$limit, $limit); - - return array($pnb, $res->fetchAllAssoc()); + pl_redirect('annuaire/geoloc'); } function handler_vcard(&$page, $photos = null) { global $globals; - - if (($globals->asso('pub') == 'public' && is_member()) || may_update()) { - $res = XDB::query('SELECT uid - FROM groupex.membres - WHERE asso_id = {?}', $globals->asso('id')); - $vcard = new VCard($res->fetchColumn(), $photos == 'photos', 'Membre du groupe ' . $globals->asso('nom')); - $vcard->do_page($page); - } else { - return PL_FORBIDDEN; - } + $res = XDB::query('SELECT uid + FROM groupex.membres + WHERE asso_id = {?}', $globals->asso('id')); + $vcard = new VCard($res->fetchColumn(), $photos == 'photos', 'Membre du groupe ' . $globals->asso('nom')); + $vcard->do_page($page); } function handler_subscribe(&$page, $u = null) { global $globals; - - new_group_open_page('xnetgrp/inscrire.tpl'); + $page->changeTpl('xnetgrp/inscrire.tpl'); if (!$globals->asso('inscriptible')) $page->kill("Il n'est pas possible de s'inscire en ligne à ce " @@ -633,8 +610,7 @@ class XnetGrpModule extends PLModule global $globals; require_once dirname(__FILE__) . '/xnetgrp/mail.inc.php'; - - new_groupadmin_page('xnetgrp/annuaire-admin.tpl'); + $page->changeTpl('xnetgrp/annuaire-admin.tpl'); $mmlist = new MMList(S::v('uid'), S::v('password'), $globals->asso('mail_domain')); $lists = $mmlist->get_lists(); @@ -679,7 +655,7 @@ class XnetGrpModule extends PLModule { global $globals; - new_groupadmin_page('xnetgrp/membres-add.tpl'); + $page->changeTpl('xnetgrp/membres-add.tpl'); $page->addJsLink('ajax.js'); if (is_null($email)) { @@ -820,7 +796,7 @@ class XnetGrpModule extends PLModule function handler_unsubscribe(&$page) { - new_group_page('xnetgrp/membres-del.tpl'); + $page->changeTpl('xnetgrp/membres-del.tpl'); $user = get_infos(S::v('forlife')); if (empty($user)) { return PL_NOT_FOUND; @@ -842,7 +818,7 @@ class XnetGrpModule extends PLModule function handler_admin_member_del(&$page, $user = null) { - new_groupadmin_page('xnetgrp/membres-del.tpl'); + $page->changeTpl('xnetgrp/membres-del.tpl'); $user = get_infos($user); if (empty($user)) { return PL_NOT_FOUND; @@ -864,7 +840,7 @@ class XnetGrpModule extends PLModule { global $globals; - new_groupadmin_page('xnetgrp/membres-edit.tpl'); + $page->changeTpl('xnetgrp/membres-edit.tpl'); $user = get_infos($user); if (empty($user)) { @@ -965,7 +941,7 @@ class XnetGrpModule extends PLModule global $globals; require_once('rss.inc.php'); $uid = init_rss('xnetgrp/announce-rss.tpl', $user, $hash, false); - $page->register_modifier('url_catcher', array('MiniWiki', 'WikiToHTML')); + $page->register_modifier('wiki_to_html', array('MiniWiki', 'WikiToHTML')); if ($uid) { $rss = XDB::iterator("SELECT a.id, a.titre, a.texte, a.contacts, a.create_date, @@ -981,7 +957,7 @@ class XnetGrpModule extends PLModule IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo FROM groupex.announces AS a INNER JOIN auth_user_md5 AS u USING(user_id) - WHERE FIND_IN_SET(a.flags, 'public') AND peremption >= NOW() AND a.asso_id = {?}", + WHERE FIND_IN_SET('public', a.flags) AND peremption >= NOW() AND a.asso_id = {?}", $globals->asso('id')); } $page->assign('asso', $globals->asso()); @@ -991,8 +967,8 @@ class XnetGrpModule extends PLModule function handler_edit_announce(&$page, $aid = null) { global $globals, $platal; - new_groupadmin_page('xnetgrp/announce-edit.tpl'); - $page->register_modifier('url_catcher', array('MiniWiki','WikiToHTML')); + $page->changeTpl('xnetgrp/announce-edit.tpl'); + $page->register_modifier('wiki_to_html', array('MiniWiki','WikiToHTML')); $page->assign('new', is_null($aid)); $art = array(); @@ -1039,17 +1015,28 @@ class XnetGrpModule extends PLModule $promo_min = ($art['public'] ? 0 : $art['promo_min']); $promo_max = ($art['public'] ? 0 : $art['promo_max']); if (is_null($aid)) { + $fulltext = $art['texte']; + if (!empty($art['contact_html'])) { + $fulltext .= "\n\n'''Contacts :'''\\\\\n" . $art['contact_html']; + } + $post = null; + if ($globals->asso('forum')) { + require_once 'banana/forum.inc.php'; + $banana = new ForumsBanana(S::v('forlife')); + $post = $banana->post($globals->asso('forum'), null, + $art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80)); + } XDB::query("INSERT INTO groupex.announces (user_id, asso_id, create_date, titre, texte, contacts, - peremption, promo_min, promo_max, flags) - VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?})", + peremption, promo_min, promo_max, flags, post_id) + VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})", S::i('uid'), $globals->asso('id'), $art['titre'], $art['texte'], $art['contact_html'], - $art['peremption'], $promo_min, $promo_max, $art['public'] ? 'public' : ''); + $art['peremption'], $promo_min, $promo_max, $art['public'] ? 'public' : '', $post); $aid = XDB::insertId(); if ($art['xorg']) { require_once('validations.inc.php'); $article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'], - MiniWiki::WikiToHTML($art['texte'] . (!empty($art['contact_html']) ? "\n\nContacts :\n" . $art['contact_html'] : "")), + MiniWiki::WikiToHTML($fulltext), $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::v('uid')); $article->submit(); $page->trig("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation"); @@ -1077,7 +1064,7 @@ class XnetGrpModule extends PLModule if (empty($art) && !is_null($aid)) { $res = XDB::query("SELECT a.*, u.nom, u.prenom, u.promo, l.alias AS forlife, - FIND_IN_SET(a.flags, 'public') AS public + FIND_IN_SET('public', a.flags) AS public FROM groupex.announces AS a INNER JOIN auth_user_md5 AS u USING(user_id) INNER JOIN aliases AS l ON (l.id = u.user_id AND l.type = 'a_vie') @@ -1091,22 +1078,6 @@ class XnetGrpModule extends PLModule } } - $select = ''; - for ($i = 1 ; $i < 30 ; $i++) { - $time = time() + 3600 * 24 * $i; - $p_stamp = date('Ymd', $time); - $year = date('Y', $time); - $month = date('m', $time); - $day = date('d', $time); - - $select .= "\n"; - } - $page->assign('select', $select); - if (is_null($aid)) { $events = XDB::iterator("SELECT * FROM groupex.evenements @@ -1117,24 +1088,24 @@ class XnetGrpModule extends PLModule } } - $art['contact_html'] = MiniWiki::WikiToHTML($art['contact_html']); + $art['contact_html'] = @MiniWiki::WikiToHTML($art['contact_html']); $page->assign('art', $art); } function handler_admin_announce(&$page) { global $globals; - new_groupadmin_page('xnetgrp/announce-admin.tpl'); + $page->changeTpl('xnetgrp/announce-admin.tpl'); if (Env::has('del')) { - XDB::execute("DELETE FROM groupex.announces - WHERE id = {?} AND asso_id = {?}", + XDB::execute("DELETE FROM groupex.announces + WHERE id = {?} AND asso_id = {?}", Env::i('del'), $globals->asso('id')); } - $res = XDB::iterator("SELECT a.id, a.titre, a.peremption, a.peremption < CURRENT_DATE() AS perime - FROM groupex.announces AS a - WHERE a.asso_id = {?} - ORDER BY a.peremption DESC", + $res = XDB::iterator("SELECT a.id, a.titre, a.peremption, a.peremption < CURRENT_DATE() AS perime + FROM groupex.announces AS a + WHERE a.asso_id = {?} + ORDER BY a.peremption DESC", $globals->asso('id')); $page->assign('articles', $res); }