X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=eda32c13ab1f18201b59ad571bf1dea77259d5c7;hb=833a6e86ea17d40444ae32cd6c92b9359f383e71;hp=e72013c259940ade3f85a5083f63545f9e51a667;hpb=f6d7a2df40acc6892fa79bbf35939276b8810728;p=platal.git
diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index e72013c..eda32c1 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -25,48 +25,40 @@ class XnetGrpModule extends PLModule
function handlers()
{
return array(
- '%grp' => $this->make_hook('index', AUTH_PUBLIC),
- '%grp/asso.php' => $this->make_hook('index', AUTH_PUBLIC),
- '%grp/logo' => $this->make_hook('logo', AUTH_PUBLIC),
- '%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, 'groupmember'),
- '%grp/annuaire' => $this->make_hook('annuaire', AUTH_MDP, 'groupannu'),
- '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_MDP, 'groupmember:groupannu'),
- '%grp/annuaire/csv' => $this->make_hook('csv', 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/subscribe/valid' => $this->make_hook('subscribe_valid', AUTH_MDP, 'groupadmin'),
- '%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, '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),
- '%grp/member/del'
- => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'),
-
- '%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/announce/photo' => $this->make_hook('photo_announce', AUTH_PUBLIC),
- '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP, 'groupadmin'),
+ '%grp' => $this->make_hook('index', AUTH_PUBLIC),
+ '%grp/asso.php' => $this->make_hook('index', AUTH_PUBLIC),
+ '%grp/logo' => $this->make_hook('logo', AUTH_PUBLIC),
+ '%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, 'groupmember'),
+ '%grp/annuaire' => $this->make_hook('annuaire', AUTH_MDP, 'groupannu'),
+ '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_MDP, 'groupmember:groupannu'),
+ '%grp/annuaire/csv' => $this->make_hook('csv', 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/subscribe/valid' => $this->make_hook('subscribe_valid', AUTH_MDP, 'groupadmin'),
+ '%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, '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),
+ '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'),
+
+ '%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/announce/photo' => $this->make_hook('photo_announce', AUTH_PUBLIC),
+ '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP, 'groupadmin'),
);
}
function handler_index(&$page, $arg = null)
{
global $globals, $platal;
-
if (!is_null($arg)) {
return PL_NOT_FOUND;
}
@@ -74,50 +66,50 @@ class XnetGrpModule extends PLModule
if (S::logged()) {
if (Env::has('read')) {
- XDB::query('DELETE groupex.r.*
- FROM groupex.announces_read AS r
- INNER JOIN groupex.announces AS a ON a.id = r.announce_id
+ XDB::query('DELETE group_r.*
+ FROM group_announces_read AS r
+ INNER JOIN group_announces AS a ON a.id = r.announce_id
WHERE peremption < CURRENT_DATE()');
- XDB::query('INSERT INTO groupex.announces_read
+ XDB::query('INSERT INTO group_announces_read
VALUES ({?}, {?})',
Env::i('read'), S::i('uid'));
pl_redirect("");
}
if (Env::has('unread')) {
- XDB::query('DELETE FROM groupex.announces_read
+ XDB::query('DELETE FROM group_announces_read
WHERE announce_id={?} AND user_id={?}',
Env::i('unread'), S::i('uid'));
pl_redirect("#art" . Env::i('unread'));
}
// XXX: Fix promo_min; promo_max
- $arts = XDB::iterator("SELECT a.*, FIND_IN_SET('photo', a.flags) AS photo
- FROM groupex.announces AS a
- LEFT JOIN groupex.announces_read AS r ON (r.user_id = {?} AND r.announce_id = a.id)
- WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
- AND (promo_min = 0 OR promo_min <= {?})
- AND (promo_max = 0 OR promo_max >= {?})
- AND r.announce_id IS NULL
- ORDER BY a.peremption",
- S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
- $index = XDB::iterator("SELECT a.id, a.titre, r.user_id IS NULL AS nonlu
- FROM groupex.announces AS a
- LEFT JOIN groupex.announces_read AS r ON (a.id = r.announce_id AND r.user_id = {?})
- WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+ $arts = XDB::iterator("SELECT a.*, FIND_IN_SET('photo', a.flags) AS photo
+ FROM group_announces AS a
+ LEFT JOIN group_announces_read AS r ON (r.user_id = {?} AND r.announce_id = a.id)
+ WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
AND (promo_min = 0 OR promo_min <= {?})
AND (promo_max = 0 OR promo_max >= {?})
- ORDER BY a.peremption",
+ AND r.announce_id IS NULL
+ ORDER BY a.peremption",
+ S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
+ $index = XDB::iterator("SELECT a.id, a.titre, r.user_id IS NULL AS nonlu
+ FROM group_announces AS a
+ LEFT JOIN group_announces_read AS r ON (a.id = r.announce_id AND r.user_id = {?})
+ WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+ AND (promo_min = 0 OR promo_min <= {?})
+ AND (promo_max = 0 OR promo_max >= {?})
+ ORDER BY a.peremption",
S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
$page->assign('article_index', $index);
} else {
- $arts = XDB::iterator("SELECT a.*, FIND_IN_SET('photo', a.flags) AS photo
- FROM groupex.announces AS a
- WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
- AND FIND_IN_SET('public', a.flags)",
+ $arts = XDB::iterator("SELECT a.*, FIND_IN_SET('photo', a.flags) AS photo
+ FROM group_announces AS a
+ WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+ AND FIND_IN_SET('public', a.flags)",
$globals->asso('id'));
}
if (may_update()) {
$subs_valid = XDB::query("SELECT uid
- FROM groupex.membres_sub_requests
+ FROM group_member_sub_requests
WHERE asso_id = {?}",
$globals->asso('id'));
$page->assign('requests', $subs_valid->numRows());
@@ -137,29 +129,7 @@ class XnetGrpModule extends PLModule
function handler_logo(&$page)
{
global $globals;
-
- $res = XDB::query("SELECT logo, logo_mime
- FROM groupex.asso WHERE id = {?}",
- $globals->asso('id'));
- list($logo, $logo_mime) = $res->fetchOneRow();
-
- if (!empty($logo)) {
- header("Content-type: $mime");
- header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
- header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT');
- header('Cache-Control: no-cache, must-revalidate');
- header('Pragma: no-cache');
- echo $logo;
- } else {
- header('Content-type: image/jpeg');
- header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
- header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT');
- header('Cache-Control: no-cache, must-revalidate');
- header('Pragma: no-cache');
- readfile(dirname(__FILE__).'/../htdocs/images/dflt_carre.jpg');
- }
-
- exit;
+ $globals->asso()->getLogo()->send();
}
function handler_site(&$page)
@@ -194,12 +164,12 @@ class XnetGrpModule extends PLModule
$site = "";
}
if (S::has_perms()) {
- if (strstr(Post::v('mail_domain'), '.') === false) {
- $page->trigError("le domaine doit être un FQDN (aucune modif effectuée) !!!");
+ if (Post::v('mail_domain') && (strstr(Post::v('mail_domain'), '.') === false)) {
+ $page->trigError('Le domaine doit être un FQDN (aucune modification effectuée) !!!');
return;
}
XDB::execute(
- "UPDATE groupex.asso
+ "UPDATE groups
SET nom={?}, diminutif={?}, cat={?}, dom={?},
descr={?}, site={?}, mail={?}, resp={?},
forum={?}, mail_domain={?}, ax={?}, pub={?},
@@ -220,15 +190,14 @@ class XnetGrpModule extends PLModule
}
} else {
XDB::execute(
- "UPDATE groupex.asso
+ "UPDATE groups
SET descr={?}, site={?}, mail={?}, resp={?},
- forum={?}, ax={?}, pub= {?}, sub_url={?},
+ forum={?}, pub= {?}, sub_url={?},
unsub_url={?},flags={?}
WHERE id={?}",
Post::v('descr'), $site,
Post::v('mail'), Post::v('resp'),
- Post::v('forum'), Post::has('ax'),
- Post::v('pub'),
+ Post::v('forum'), Post::v('pub'),
Post::v('sub_url'), Post::v('unsub_url'),
$flags, $globals->asso('id'));
}
@@ -237,11 +206,11 @@ class XnetGrpModule extends PLModule
if ($_FILES['logo']['name']) {
$upload = PlUpload::get($_FILES['logo'], $globals->asso('id'), 'asso.logo', true);
if (!$upload) {
- $page->trigError("Impossible de télécharger le logo");
+ $page->trigError("Impossible de télécharger le logo.");
} else {
- XDB::execute('UPDATE groupex.asso
- SET logo={?}, logo_mime={?}
- WHERE id={?}', $upload->getContents(), $upload->contentType(),
+ XDB::execute('UPDATE groups
+ SET logo = {?}, logo_mime = {?}
+ WHERE id = {?}', $upload->getContents(), $upload->contentType(),
$globals->asso('id'));
$upload->rm();
}
@@ -250,16 +219,11 @@ class XnetGrpModule extends PLModule
pl_redirect('../'.Post::v('diminutif', $globals->asso('diminutif')).'/edit');
}
- if (S::has_perms()) {
- $dom = XDB::iterator('SELECT * FROM groupex.dom ORDER BY nom');
+ if (S::admin()) {
+ $dom = XDB::iterator('SELECT * FROM group_dom ORDER BY nom');
$page->assign('dom', $dom);
$page->assign('super', true);
}
- if (!$globals->asso('wiki_desc') && $globals->asso('descr')) {
- $page->trigWarning("Attention, le format de la description a changé et utilise désormais la syntaxe wiki "
- . "intégrée au site. Il te faudra probablement adapter le formatage du texte actuel pour "
- . "qu'il s'affiche correctement avec cette nouvelle syntaxe.");
- }
}
function handler_mail(&$page)
@@ -285,12 +249,18 @@ class XnetGrpModule extends PLModule
$this->load('mail.inc.php');
set_time_limit(120);
$tos = get_all_redirects($mbr, $mls, $mmlist);
+
$upload = PlUpload::get($_FILES['uploaded'], S::user()->login(), 'xnet.emails', true);
+ if (!$upload && @$_FILES['uploaded']['name'] && PlUpload::$lastError != null) {
+ $page->trigError(PlUpload::$lastError);
+ return;
+ }
+
send_xnet_mails($from, $sujet, $body, Env::v('wiki'), $tos, Post::v('replyto'), $upload, @$_FILES['uploaded']['name']);
if ($upload) {
$upload->rm();
}
- $page->killSuccess("Email envoyé !");
+ $page->killSuccess("Email envoyé !");
$page->assign('sent', true);
}
}
@@ -318,7 +288,8 @@ class XnetGrpModule extends PLModule
} else if ($action == 'geoloc' || $action == 'trombi') {
$view = new UserSet();
$view->addMod('trombi', 'Trombinoscope');
- $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'annuaire/search'));
+ // TODO: Reactivate when the new map is completed.
+ // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'annuaire/search'));
$view->apply('annuaire', $page, $action, $subaction);
if ($action == 'geoloc' && $subaction) {
return;
@@ -327,20 +298,29 @@ class XnetGrpModule extends PLModule
$page->changeTpl('xnetgrp/annuaire.tpl');
$sort = Env::s('order', 'directory_name');
+ $ofs = Env::i('offset');
+ if ($ofs < 0) {
+ $ofs = 0;
+ }
+
+ $sdesc = $sort{0} == '-';
+ $sf = $sdesc ? substr($sort, 1) : $sort;
+ if ($sf == 'promo') {
+ $se = new UFO_Promo(null, $sdesc);
+ } else {
+ $se = new UFO_Name($sf, null, null, $sdesc);
+ }
if (Env::b('admin')) {
- $uids = XDB::fetchColumn('SELECT uid
- FROM groupex.membres
- WHERE asso_id = {?} AND perms = \'admin\'',
- $globals->asso('id'));
+ $uf = $globals->asso()->getAdmins(null, $se);
} else {
- $uids = XDB::fetchColumn('SELECT uid
- FROM groupex.membres
- WHERE asso_id = {?}', $globals->asso('id'));
+ $uf = $globals->asso()->getMembers(null, $se);
}
- $users = User::getBuildUsersWithUIDs($uids, $sort,
- NB_PER_PAGE, $ofs * NB_PER_PAGE);
- $page->assign('pages', (count($uids) + NB_PER_PAGE - 1) / NB_PER_PAGE);
+ $users = $uf->getUsers(new PlLimit(NB_PER_PAGE, $ofs * NB_PER_PAGE));
+ $count = $uf->getTotalCount();
+
+ $page->assign('pages', floor(($count + NB_PER_PAGE - 1) / NB_PER_PAGE));
+ $page->assign('current', $ofs);
$page->assign('order', $sort);
$page->assign('users', $users);
$page->assign('only_admin', Env::b('admin'));
@@ -359,11 +339,8 @@ class XnetGrpModule extends PLModule
function handler_vcard(&$page, $photos = null)
{
global $globals;
- $res = XDB::query('SELECT uid
- FROM groupex.membres
- WHERE asso_id = {?}', $globals->asso('id'));
$vcard = new VCard($photos == 'photos', 'Membre du groupe ' . $globals->asso('nom'));
- $vcard->addUsers($res->fetchColumn());
+ $vcard->addUsers($globals->asso()->getMembers()->getUIDs());
$vcard->show();
}
@@ -373,14 +350,11 @@ class XnetGrpModule extends PLModule
if (is_null($filename)) {
$filename = $globals->asso('diminutif') . '.csv';
}
- $id = XDB::fetchColumn("SELECT uid
- FROM groupex.membres
- WHERE asso_id = {?}",
- $globals->asso('id'));
- $users = User::getBuildUsersWithUIDs($id, 'full_name');
+ $users = $globals->asso()->getMembers(null, new UFO_Name('directory_name'))->getUsers();
header('Content-Type: text/x-csv; charset=utf-8;');
header('Pragma: ');
header('Cache-Control: ');
+ pl_content_headers("text/x-csv");
$page->changeTpl('xnetgrp/annuaire-csv.tpl', NO_SKIN);
$page->assign('users', $users);
}
@@ -388,7 +362,7 @@ class XnetGrpModule extends PLModule
private function removeSubscriptionRequest($uid)
{
global $globals;
- XDB::execute("DELETE FROM groupex.membres_sub_requests
+ XDB::execute("DELETE FROM group_member_sub_requests
WHERE asso_id = {?} AND uid = {?}",
$globals->asso('id'), $uid);
}
@@ -397,7 +371,7 @@ class XnetGrpModule extends PLModule
{
global $globals;
$this->removeSubscriptionRequest($user->id());
- XDB::execute("INSERT IGNORE INTO groupex.membres (asso_id, uid)
+ XDB::execute("INSERT IGNORE INTO group_members (asso_id, uid)
VALUES ({?}, {?})",
$globals->asso('id'), $user->id());
if (XDB::affectedRows() == 1) {
@@ -438,13 +412,13 @@ class XnetGrpModule extends PLModule
// Retrieves the subscription status, and the reason.
$res = XDB::query("SELECT reason
- FROM groupex.membres_sub_requests
+ FROM group_member_sub_requests
WHERE asso_id = {?} AND uid = {?}",
$globals->asso('id'), $user->id());
$reason = ($res->numRows() ? $res->fetchOneCell() : null);
$res = XDB::query("SELECT COUNT(*)
- FROM groupex.membres
+ FROM group_members
WHERE asso_id = {?} AND uid = {?}",
$globals->asso('id'), $user->id());
$already_member = ($res->fetchOneCell() > 0);
@@ -452,7 +426,7 @@ class XnetGrpModule extends PLModule
// Handles the membership request.
if ($already_member) {
$this->removeSubscriptionRequest($user->id());
- $page->kill($user->fullName() . " est déjà membre du groupe !");
+ $page->kill($user->fullName() . ' est déjà membre du groupe !');
} elseif (Env::has('accept')) {
S::assert_xsrf_token();
@@ -468,7 +442,7 @@ class XnetGrpModule extends PLModule
$mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription annulée');
$mailer->setTxtBody(Env::v('motif'));
$mailer->send();
- $page->kill("La demande de {$user->fullName()} a bien été refusée.");
+ $page->killSuccess("La demande de {$user->fullName()} a bien été refusée.");
} else {
$page->assign('show_form', true);
$page->assign('reason', $reason);
@@ -477,12 +451,12 @@ class XnetGrpModule extends PLModule
}
if (is_member()) {
- $page->kill("Tu es déjà membre !");
+ $page->kill("Tu es déjà membre !");
return;
}
$res = XDB::query("SELECT uid
- FROM groupex.membres_sub_requests
+ FROM group_member_sub_requests
WHERE uid = {?} AND asso_id = {?}",
S::i('uid'), $globals->asso('id'));
if ($res->numRows() != 0) {
@@ -493,14 +467,14 @@ class XnetGrpModule extends PLModule
if (Post::has('inscrire')) {
S::assert_xsrf_token();
- XDB::execute("INSERT INTO groupex.membres_sub_requests (asso_id, uid, ts, reason)
+ XDB::execute("INSERT INTO group_member_sub_requests (asso_id, uid, ts, reason)
VALUES ({?}, {?}, NOW(), {?})",
$globals->asso('id'), S::i('uid'), Post::v('message'));
$res = XDB::query('SELECT IF(m.email IS NULL,
CONCAT(al.alias,"@polytechnique.org"),
m.email)
- FROM groupex.membres AS m
- INNER JOIN aliases AS al ON (al.type = "a_vie"
+ FROM group_members AS m
+ INNER JOIN #x4dat#.aliases AS al ON (al.type = "a_vie"
AND al.id = m.uid)
WHERE perms="admin" AND m.asso_id = {?}',
$globals->asso('id'));
@@ -519,7 +493,8 @@ class XnetGrpModule extends PLModule
. "Ã l'adresse : support@polytechnique.org\n";
if (!$to) {
- $to = $globals->asso("mail").", support@polytechnique.org";
+ $to = ($globals->asso('mail') != '') ? $globals->asso('mail') . ', ' : '';
+ $to .= 'support@polytechnique.org';
$append = "\n-- \nLe groupe ".$globals->asso("nom")
." n'a pas d'administrateur, l'équipe de"
." Polytechnique.org a été prévenue et va rapidement"
@@ -555,14 +530,11 @@ class XnetGrpModule extends PLModule
}
}
- $it = XDB::iterator("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom,
- u.prenom, u.promo, u.hruid, s.ts AS date
- FROM groupex.membres_sub_requests AS s
- INNER JOIN auth_user_md5 AS u ON (s.uid = u.user_id)
- WHERE asso_id = {?}
- ORDER BY nom, prenom",
- $globals->asso('id'));
-
+ $it = XDB::iterator('SELECT s.uid, a.hruid, s.ts AS date
+ FROM group_member_sub_requests AS s
+ INNER JOIN #x4dat#.accounts AS a ON(s.uid = a.uid)
+ WHERE s.asso_id = {?}
+ ORDER BY s.ts', $globals->asso('id'));
$page->changeTpl('xnetgrp/subscribe-valid.tpl');
$page->assign('valid', $it);
}
@@ -591,7 +563,6 @@ class XnetGrpModule extends PLModule
break;
}
}
-// var_dump($_SESSION);
http_redirect($_SERVER['HTTP_REFERER']);
}
@@ -601,8 +572,8 @@ class XnetGrpModule extends PLModule
$this->load('mail.inc.php');
$page->changeTpl('xnetgrp/annuaire-admin.tpl');
- $mmlist = new MMList(S::v('uid'), S::v('password'),
- $globals->asso('mail_domain'));
+ $user = S::user();
+ $mmlist = new MMList($user, $globals->asso('mail_domain'));
$lists = $mmlist->get_lists();
if (!$lists) $lists = array();
$listes = array_map(create_function('$arr', 'return $arr["list"];'), $lists);
@@ -619,16 +590,10 @@ class XnetGrpModule extends PLModule
$not_in_group_ext = array();
foreach ($subscribers as $mail) {
- $res = XDB::query(
- 'SELECT COUNT(*)
- FROM groupex.membres AS m
- LEFT JOIN auth_user_md5 AS u ON (m.uid=u.user_id AND m.uid<50000)
- LEFT JOIN aliases AS a ON (a.id=u.user_id and a.type="a_vie")
- WHERE asso_id = {?} AND
- (m.email = {?} OR CONCAT(a.alias, "@polytechnique.org") = {?})',
- $globals->asso('id'), $mail, $mail);
- if ($res->fetchOneCell() == 0) {
- if (strstr($mail, '@polytechnique.org') === false) {
+ $uf = new UserFilter(new UFC_And(new UFC_Group($globals->asso('id')),
+ new UFC_Email($mail)));
+ if ($uf->getTotalCount() == 0) {
+ if (User::isForeignEmailAddress($mail)) {
$not_in_group_ext[] = $mail;
} else {
$not_in_group_x[] = $mail;
@@ -657,19 +622,17 @@ class XnetGrpModule extends PLModule
if (!User::isForeignEmailAddress($email)) {
$user = User::get($email);
if ($user) {
- XDB::execute("REPLACE INTO groupex.membres (uid, asso_id, origine)
+ XDB::execute("REPLACE INTO group_members (uid, asso_id, origine)
VALUES ({?}, {?}, 'X')",
$user->id(), $globals->asso('id'));
pl_redirect("member/" . $user->login());
}
} else {
if (isvalid_email($email)) {
- if (Env::v('x') && Env::has('userid') && Env::i('userid')) {
+ if (Env::v('x') && Env::i('userid')) {
$uid = Env::i('userid');
- $res = XDB::query("SELECT *
- FROM auth_user_md5
- WHERE user_id = {?} AND perms = 'pending'", $uid);
- if ($res->numRows() == 1) {
+ $user = User::getWithUID($uid);
+ if ($user && $user->state == 'pending') {
if (Env::v('market')) {
$market = Marketing::get($uid, $email);
if (!$market) {
@@ -678,7 +641,7 @@ class XnetGrpModule extends PLModule
$market->add();
}
}
- XDB::execute('REPLACE INTO groupex.membres (uid, asso_id, origine, email)
+ XDB::execute('REPLACE INTO group_members (uid, asso_id, origine, email)
VALUES ({?}, {?}, "X", {?})',
$uid, $globals->asso('id'), $email);
$this->removeSubscriptionRequest($uid);
@@ -686,68 +649,62 @@ class XnetGrpModule extends PLModule
}
$page->trigError("Utilisateur invalide");
} else {
- $res = XDB::query('SELECT MAX(uid)+1 FROM groupex.membres');
+ $res = XDB::query('SELECT MAX(uid) + 1 FROM group_members');
$uid = max(intval($res->fetchOneCell()), 50001);
- XDB::execute('REPLACE INTO groupex.membres (uid, asso_id, origine, email)
+ XDB::execute('REPLACE INTO group_members (uid, asso_id, origine, email)
VALUES ({?}, {?}, "ext", {?})',
$uid, $globals->asso('id'), $email);
pl_redirect("member/$email");
}
} else {
- $page->trigError("« $email » n'est pas une adresse email valide.");
+ $page->trigError("« $email » n'est pas une adresse email valide.");
}
}
}
function handler_admin_member_new_ajax(&$page)
{
- header('Content-Type: text/html; charset="UTF-8"');
+ pl_content_headers("text/html");
$page->changeTpl('xnetgrp/membres-new-search.tpl', NO_SKIN);
- $res = null;
+ $users = array();
if (Env::has('login')) {
- require_once 'user.func.inc.php';
- $res = get_not_registered_user(Env::v('login'), true);
+ $user = User::getSilent(Env::t('login'));
+ if ($user && $user->state != 'pending') {
+ $users = array($user);
+ }
}
- if (is_null($res)) {
- list($nom, $prenom) = str_replace(array('-', ' ', "'"), '%', array(Env::v('nom'), Env::v('prenom')));
- $where = "perms = 'pending'";
+ if (empty($users)) {
+ list($nom, $prenom) = str_replace(array('-', ' ', "'"), '%', array(Env::t('nom'), Env::t('prenom')));
+ $cond = new UFC_And(new UFC_Not(new UFC_Registered()));
if (!empty($nom)) {
- $where .= " AND nom LIKE '%$nom%'";
+ $cond->addChild(new UFC_Name(UserFilter::LASTNAME, $nom, UFC_Name::CONTAINS));
}
if (!empty($prenom)) {
- $where .= " AND prenom LIKE '%$prenom%'";
+ $cond->addChild(new UFC_Name(UserFilter::FIRSTNAME, $prenom, UFC_Name::CONTAINS));
}
- if (preg_match('/^[0-9]{4}$/', Env::v('promo'))) {
- $where .= " AND promo = " . Env::i('promo');
- } elseif (preg_match('/^[0-9]{2}$/', Env::v('promo'))) {
- $where .= " AND MOD(promo, 100) = " . Env::i('promo');
- } elseif (Env::has('promo')) {
- return;
+ if (Env::i('promo')) {
+ $cond->addChild(new UFC_Promo('=', UserFilter::GRADE_ING, Env::i('promo')));
+ }
+ $uf = new UserFilter($cond);
+ $users = $uf->getUsers(new PlLimit(30));
+ if ($uf->getTotalCount() > 30) {
+ $page->assign('too_many', true);
+ $users = array();
}
- $res = XDB::iterator("SELECT user_id, nom, prenom, promo
- FROM auth_user_md5
- WHERE $where");
- }
- if ($res && $res->total() < 30) {
- $page->assign("choix", $res);
}
+ $page->assign('users', $users);
}
function unsubscribe(PlUser &$user)
{
global $globals;
- XDB::execute("DELETE FROM groupex.membres
+ XDB::execute("DELETE FROM group_members
WHERE uid = {?} AND asso_id = {?}",
$user->id(), $globals->asso('id'));
if ($globals->asso('notif_unsub')) {
$mailer = new PlMailer('xnetgrp/unsubscription-notif.mail.tpl');
- $uids = XDB::fetchColumn('SELECT uid
- FROM groupex.membres
- WHERE perms = \'admin\' AND asso_id = {?}',
- $globals->asso('id'));
- $users = User::getBuildUsersWithUIDs($uids);
- foreach ($users as $user) {
+ foreach ($globals->asso()->getMembers()->getUsers() as $user) {
$mailer->addTo($user);
}
$mailer->assign('group', $globals->asso('nom'));
@@ -829,9 +786,9 @@ class XnetGrpModule extends PLModule
}
if ($this->unsubscribe($user)) {
- $page->trigSuccess("{$user->fullName()} a été désinscrit du groupe !");
+ $page->trigSuccess("{$user->fullName()} a été désinscrit du groupe !");
} else {
- $page->trigWarning("{$user->fullName()} a été désinscrit du groupe, mais des erreurs subsistent !");
+ $page->trigWarning("{$user->fullName()} a été désinscrit du groupe, mais des erreurs subsistent !");
}
}
@@ -863,17 +820,17 @@ class XnetGrpModule extends PLModule
// Check if the user is already in the group
global $globals;
$res = XDB::query("SELECT uid, email
- FROM groupex.membres
+ FROM group_members
WHERE uid = {?} AND asso_id = {?}",
$uid, $globals->asso('id'));
if ($res->numRows()) {
list($uid, $email) = $res->fetchOneRow();
- XDB::execute("DELETE FROM groupex.membres
+ XDB::execute("DELETE FROM group_members
WHERE uid = {?}",
$user['uid']);
} else {
$email = $user['email'];
- XDB::execute("UPDATE groupex.membres
+ XDB::execute("UPDATE group_members
SET uid = {?}, origine = 'X'
WHERE uid = {?} AND asso_id = {?}",
$uid, $user['uid'], $globals->asso('id'));
@@ -937,9 +894,9 @@ class XnetGrpModule extends PLModule
$user['prenom'] = (Post::v('origine') == 'ext') ? Post::v('prenom') : '';
$user['sexe'] = (Post::v('origine') == 'ext') ? Post::v('sexe') : 0;
$user['origine'] = Post::v('origine');
- XDB::query('UPDATE groupex.membres
- SET prenom={?}, nom={?}, email={?}, sexe={?}, origine={?}
- WHERE uid={?} AND asso_id={?}',
+ XDB::query('UPDATE group_members
+ SET prenom = {?}, nom = {?}, email = {?}, sexe = {?}, origine = {?}
+ WHERE uid = {?} AND asso_id = {?}',
$user['prenom'], $user['nom'], Post::v('email'),
$user['sexe'], $user['origine'],
$user['uid'], $globals->asso('id'));
@@ -951,13 +908,13 @@ class XnetGrpModule extends PLModule
$perms = Post::i('is_admin');
$comm = Post::t('comm');
if ($user['perms'] != $perms || $user['comm'] != $comm) {
- XDB::query('UPDATE groupex.membres
- SET perms={?}, comm={?}
- WHERE uid={?} AND asso_id={?}',
+ XDB::query('UPDATE group_members
+ SET perms = {?}, comm = {?}
+ WHERE uid = {?} AND asso_id = {?}',
$perms ? 'admin' : 'membre', $comm,
$user['uid'], $globals->asso('id'));
if ($perms != $user['perms']) {
- $page->trigSuccess('Permissions modifiées !');
+ $page->trigSuccess('Permissions modifiées !');
}
if ($comm != $user['comm']) {
$page->trigSuccess('Commentaire mis à jour.');
@@ -1049,23 +1006,23 @@ class XnetGrpModule extends PLModule
function handler_photo_announce(&$page, $eid = null) {
if ($eid) {
- $res = XDB::query("SELECT * FROM groupex.announces_photo WHERE eid = {?}", $eid);
+ $res = XDB::query("SELECT * FROM group_announces_photo WHERE eid = {?}", $eid);
if ($res->numRows()) {
$photo = $res->fetchOneAssoc();
- header('Content-Type: image/' . $photo['attachmime']);
+ pl_cached_dynamic_content_headers("image/" . $photo['attachmime']);
echo $photo['attach'];
exit;
}
} else {
$upload = new PlUpload(S::user()->login(), 'xnetannounce');
if ($upload->exists() && $upload->isType('image')) {
- header('Content-Type: ' . $upload->contentType());
+ pl_cached_dynamic_content_headers($upload->contentType());
echo $upload->getContents();
exit;
}
}
global $globals;
- header('Content-Type: image/png');
+ pl_cached_dynamic_content_headers("image/png");
echo file_get_contents($globals->spoolroot . '/htdocs/images/logo.png');
exit;
}
@@ -1126,7 +1083,7 @@ class XnetGrpModule extends PLModule
}
$art['photo'] = $upload->exists() || Post::i('photo');
if (Post::v('valid') == 'Pas d\'image' && !is_null($aid)) {
- XDB::query("DELETE FROM groupex.announces_photo WHERE eid = {?}", $aid);
+ XDB::query("DELETE FROM group_announces_photo WHERE eid = {?}", $aid);
$upload->rm();
Post::kill('valid');
$art['photo'] = false;
@@ -1155,7 +1112,7 @@ class XnetGrpModule extends PLModule
$post = $banana->post($globals->asso('forum'), null,
$art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80));
}*/
- XDB::query("INSERT INTO groupex.announces
+ XDB::query("INSERT INTO group_announces
(user_id, asso_id, create_date, titre, texte, contacts,
peremption, promo_min, promo_max, flags, post_id)
VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
@@ -1164,7 +1121,7 @@ class XnetGrpModule extends PLModule
$aid = XDB::insertId();
if ($art['photo']) {
list($imgx, $imgy, $imgtype) = $upload->imageInfo();
- XDB::execute("INSERT INTO groupex.announces_photo
+ XDB::execute("INSERT INTO group_announces_photo
SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}",
$aid, $imgtype, $imgx, $imgy, $upload->getContents());
}
@@ -1186,7 +1143,7 @@ class XnetGrpModule extends PLModule
$page->trigWarning("La parution dans la Lettre Mensuelle est en attente de validation.");
}
} else {
- XDB::query("UPDATE groupex.announces
+ XDB::query("UPDATE group_announces
SET titre={?}, texte={?}, contacts={?}, peremption={?},
promo_min={?}, promo_max={?}, flags={?}
WHERE id={?} AND asso_id={?}",
@@ -1195,8 +1152,8 @@ class XnetGrpModule extends PLModule
$art['id'], $globals->asso('id'));
if ($art['photo'] && $upload->exists()) {
list($imgx, $imgy, $imgtype) = $upload->imageInfo();
- XDB::execute("REPLACE INTO groupex.announces_photo
- SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}",
+ XDB::execute("REPLACE INTO group_announces_photo
+ SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}",
$aid, $imgtype, $imgx, $imgy, $upload->getContents());
$upload->rm();
}
@@ -1207,12 +1164,10 @@ class XnetGrpModule extends PLModule
}
if (empty($art) && !is_null($aid)) {
- $res = XDB::query("SELECT a.*, u.nom, u.prenom, u.promo, u.hruid,
- FIND_IN_SET('public', a.flags) AS public,
- FIND_IN_SET('photo', a.flags) AS photo
- FROM groupex.announces AS a
- INNER JOIN auth_user_md5 AS u USING(user_id)
- WHERE asso_id = {?} AND a.id = {?}",
+ $res = XDB::query("SELECT a.*, FIND_IN_SET('public', a.flags) AS public,
+ FIND_IN_SET('photo', a.flags) AS photo
+ FROM group_announces AS a
+ WHERE asso_id = {?} AND a.id = {?}",
$globals->asso('id'), $aid);
if ($res->numRows()) {
$art = $res->fetchOneAssoc();
@@ -1224,7 +1179,7 @@ class XnetGrpModule extends PLModule
if (is_null($aid)) {
$events = XDB::iterator("SELECT *
- FROM groupex.evenements
+ FROM group_events
WHERE asso_id = {?} AND archive = 0",
$globals->asso('id'));
if ($events->total()) {
@@ -1244,12 +1199,12 @@ class XnetGrpModule extends PLModule
if (Env::has('del')) {
S::assert_xsrf_token();
- XDB::execute("DELETE FROM groupex.announces
+ XDB::execute("DELETE FROM group_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
+ FROM group_announces AS a
WHERE a.asso_id = {?}
ORDER BY a.peremption DESC",
$globals->asso('id'));