X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=96fccc2c27baf05137eeb3665059536da17ae806;hb=2c86d36840b04dfceaba65d7972ba8a5283fcd13;hp=bbb557adb8f73317a2ab3c102a7ac28d32eb7fac;hpb=1490093c909c086ce8eba3c0f5c24b62ef20cfb3;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index bbb557a..96fccc2 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -41,12 +41,12 @@ 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()); } - return $user; + return $user; } elseif ($dom == 'polytechnique.org' || $dom == 'm4x.org') { $res = XDB::query( "SELECT user_id AS uid, u.promo, @@ -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' ) @@ -80,27 +80,28 @@ class XnetGrpModule extends PLModule '%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, 'groupmember'), - '%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/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, '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'), '%grp/member/new' => $this->make_hook('admin_member_new', AUTH_MDP, 'groupadmin'), '%grp/member/new/ajax' - => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'user', NO_AUTH), + => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'user', NO_AUTH), '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'), - '%grp/rss' => $this->make_hook('rss', AUTH_PUBLIC), + '%grp/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), '%grp/announce/edit' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP, 'groupadmin'), @@ -121,7 +122,7 @@ class XnetGrpModule extends PLModule XDB::query('DELETE r.* FROM groupex.announces_read AS r INNER JOIN groupex.announces AS a ON a.id = r.announce_id - WHERE peremption < CURRENT_DATE()'); + WHERE peremption < CURRENT_DATE()'); XDB::query('INSERT INTO groupex.announces_read VALUES ({?}, {?})', Env::i('read'), S::i('uid')); @@ -158,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')); } @@ -169,7 +170,7 @@ class XnetGrpModule extends PLModule $page->setRssLink("Polytechnique.net :: {$globals->asso("nom")} :: News", 'rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml'); } - + $page->register_modifier('wiki_to_html', array('MiniWiki','WikiToHTML')); $page->assign('articles', $arts); @@ -239,7 +240,7 @@ class XnetGrpModule extends PLModule Post::v('descr'), Post::v('site'), Post::v('mail'), Post::v('resp'), Post::v('forum'), Post::v('mail_domain'), - Post::has('ax'), Post::has('pub')?'private':'public', + Post::has('ax'), Post::v('pub'), Post::v('sub_url'), Post::v('inscriptible'), Post::v('unsub_url'),$globals->asso('id')); if (Post::v('mail_domain')) { @@ -256,7 +257,7 @@ class XnetGrpModule extends PLModule Post::v('descr'), Post::v('site'), Post::v('mail'), Post::v('resp'), Post::v('forum'), Post::has('ax'), - Post::has('pub')?'private':'public', + Post::has('pub'), Post::v('sub_url'), Post::v('unsub_url'), $globals->asso('id')); } @@ -323,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')) { @@ -344,7 +355,7 @@ class XnetGrpModule extends PLModule 1, 1)) as letter, COUNT(*) FROM groupex.membres AS m LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid) - WHERE asso_id = {?} and u.perms != \'pending\' + WHERE asso_id = {?} and (u.perms != \'pending\' OR u.perms IS NULL) GROUP BY letter ORDER BY letter', $globals->asso('id')); } else { @@ -419,33 +430,31 @@ class XnetGrpModule extends PLModule LEFT JOIN emails AS e ON ( e.flags = 'active' AND e.uid = m.uid) WHERE m.asso_id = {?} $ini AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL) - GROUP BY m.uid + GROUP BY m.uid ORDER BY $tri LIMIT {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE); $page->assign('ann', $ann); $page->jsonAssign('ann', $ann); } - function handler_trombi(&$page, $action = null, $subaction = null) + function handler_trombi(&$page) { - $view = new UserSet(); - $view->addMod('trombi', 'Trombinoscope', true, array('with_admin' => false, 'with_promo' => true)); - $view->apply('trombi', $page, 'trombi', $action, $subaction); + pl_redirect('annuaire/trombi'); } - + + function handler_geoloc(&$page) + { + 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) @@ -573,7 +582,7 @@ class XnetGrpModule extends PLModule { if (Env::has('right') && (may_update() || S::has('suid'))) { switch (Env::v('right')) { - case 'admin': + case 'admin': XnetSession::killSuid(); break; case 'anim': @@ -582,7 +591,7 @@ class XnetGrpModule extends PLModule is_member(true); break; case 'member': - XnetSession::doSelfSuid(); + XnetSession::doSelfSuid(); may_update(false, true); is_member(true); break; @@ -670,7 +679,7 @@ class XnetGrpModule extends PLModule FROM auth_user_md5 AS u INNER JOIN aliases AS a ON (u.user_id = a.id) WHERE a.alias={?}', $globals->asso('id'), $forlife); - pl_redirect("member/$email"); + pl_redirect("member/$forlife"); } else { $page->trig($email." n'est pas un alias polytechnique.org valide"); } @@ -689,7 +698,7 @@ class XnetGrpModule extends PLModule $market = new Marketing($uid, $email, 'group', $globals->asso('nom'), Env::v('market_from'), S::v('uid')); $market->add(); - } + } } XDB::execute('INSERT INTO groupex.membres (uid, asso_id, origine, email) VALUES ({?}, {?}, "X", {?})', @@ -715,10 +724,12 @@ class XnetGrpModule extends PLModule { header('Content-Type: text/html; charset="UTF-8"'); $page->changeTpl('xnetgrp/membres-new-search.tpl', NO_SKIN); + $res = null; if (Env::has('login')) { require_once 'user.func.inc.php'; $res = get_not_registered_user(Env::v('login'), true); - } else { + } + if (is_null($res)) { list($nom, $prenom) = str_replace(array('-', ' ', "'"), '%', array(Env::v('nom'), Env::v('prenom'))); $where = "perms = 'pending'"; if (!empty($nom)) { @@ -827,6 +838,72 @@ class XnetGrpModule extends PLModule } } + private function changeLogin(PlatalPage &$page, array &$user, MMList &$mmlist, $login) + { + require_once 'user.func.inc.php'; + // Search the uid of the user... + $res = XDB::query("SELECT f.id, f.alias + FROM aliases AS a + INNER JOIN aliases AS f ON (f.id = a.id AND f.type = 'a_vie') + WHERE a.alias = {?}", + $login); + if ($res->numRows() == 0) { + $x = get_not_registered_user($login); + if (!$x) { + $page->trig("Le login $login ne correspond à aucun X"); + return false; + } else if (count($x) > 1) { + $page->trig("Le login $login correspond a plusieurs camarades"); + return false; + } + $uid = $x[0]['user_id']; + $sub = false; + } else { + list($uid, $login) = $res->fetchOneRow(); + $sub = true; + } + + // Check if the user is already in the group + global $globals; + $res = XDB::query("SELECT uid, email + FROM groupex.membres + WHERE uid = {?} AND asso_id = {?}", + $uid, $globals->asso('id')); + if ($res->numRows()) { + list($uid, $email) = $res->fetchOneRow(); + XDB::execute("DELETE FROM groupex.membres + WHERE uid = {?}", + $user['uid']); + } else { + $email = $user['email']; + XDB::execute("UPDATE groupex.membres + SET uid = {?}, origine = 'X' + WHERE uid = {?} AND asso_id = {?}", + $uid, $user['uid'], $globals->asso('id')); + } + if ($sub) { + $email = $login . '@' . $globals->mail->domain; + } + + // Update subscription to aliases + if ($email != $user['email']) { + XDB::execute("UPDATE IGNORE virtual_redirect AS vr + INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', 2) = {?}) + SET vr.redirect = {?} + WHERE vr.redirect = {?}", + $globals->asso('mail_domain'), $email, $user['email']); + XDB::execute("DELETE vr.* + FROM virtual_redirect AS vr + INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', 2) = {?}) + WHERE vr.redirect = {?}", + $globals->asso('mail_domain'), $user['email']); + foreach (Env::v('ml1', array()) as $ml => $state) { + $mmlist->replace_email($ml, $user['email'], $email); + } + } + return $login; + } + function handler_admin_member(&$page, $user) { global $globals; @@ -842,6 +919,15 @@ class XnetGrpModule extends PLModule $globals->asso('mail_domain')); if (Post::has('change')) { + // Convert user status to X + if ($user['origine'] == 'ext' && trim(Post::v('login_X'))) { + $forlife = $this->changeLogin($page, $user, $mmlist, trim(Post::v('login_X'))); + if ($forlife) { + pl_redirect('member/' . $forlife); + } + } + + // Update user info $email_changed = ($user['origine'] != 'X' && strtolower($user['email']) != strtolower(Post::v('email'))); $from_email = $user['email']; if ($user['origine'] != 'X') { @@ -869,6 +955,7 @@ class XnetGrpModule extends PLModule $page->trig('permissions modifiées'); } + // Update ML subscriptions foreach (Env::v('ml1', array()) as $ml => $state) { $ask = empty($_REQUEST['ml2'][$ml]) ? 0 : 2; if ($ask == $state) { @@ -895,6 +982,7 @@ class XnetGrpModule extends PLModule } } + // Change subscriptioin to aliases foreach (Env::v('ml3', array()) as $ml => $state) { $ask = !empty($_REQUEST['ml4'][$ml]); if($state == $ask) continue; @@ -948,7 +1036,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()); @@ -1006,17 +1094,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"); @@ -1040,11 +1139,11 @@ class XnetGrpModule extends PLModule } if (Post::v('valid') == 'Enregistrer' || Post::v('valid') == 'Annuler') { pl_redirect(""); - } + } 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') @@ -1058,22 +1157,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 @@ -1082,7 +1165,7 @@ class XnetGrpModule extends PLModule if ($events->total()) { $page->assign('events', $events); } - } + } $art['contact_html'] = @MiniWiki::WikiToHTML($art['contact_html']); $page->assign('art', $art); @@ -1094,14 +1177,14 @@ class XnetGrpModule extends PLModule $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); }