XDB::query('DELETE r.*
FROM group_announces_read AS r
INNER JOIN group_announces AS a ON (a.id = r.announce_id)
- WHERE peremption < CURRENT_DATE()');
+ WHERE expiration < CURRENT_DATE()');
XDB::query('INSERT INTO group_announces_read
VALUES ({?}, {?})',
Env::i('read'), S::i('uid'));
$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.uid = {?} AND r.announce_id = a.id)
- WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+ WHERE asso_id = {?} AND expiration >= 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",
+ ORDER BY a.expiration",
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
+ $index = XDB::iterator("SELECT a.id, a.titre, r.uid IS NULL AS nonlu
FROM group_announces AS a
LEFT JOIN group_announces_read AS r ON (a.id = r.announce_id AND r.uid = {?})
- WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+ WHERE asso_id = {?} AND expiration >= CURRENT_DATE()
AND (promo_min = 0 OR promo_min <= {?})
AND (promo_max = 0 OR promo_max >= {?})
- ORDER BY a.peremption",
+ ORDER BY a.expiration",
S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
$page->assign('article_index', $index);
} else {
$arts = XDB::iterator("SELECT *, FIND_IN_SET('photo', flags) AS photo
FROM group_announces
- WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+ WHERE asso_id = {?} AND expiration >= CURRENT_DATE()
AND FIND_IN_SET('public', flags)",
$globals->asso('id'));
}
} else {
$site = "";
}
- if (S::has_perms()) {
+ if (S::admin()) {
+ $page->assign('super', true);
+
if (Post::v('mail_domain') && (strstr(Post::v('mail_domain'), '.') === false)) {
$page->trigError('Le domaine doit être un FQDN (aucune modification effectuée) !!!');
return;
}
+ if (Post::t('nom') == '' || Post::t('diminutif') == '') {
+ $page->trigError('Ni le nom ni le diminutif du groupe ne peuvent être vide.');
+ return;
+ }
XDB::execute(
"UPDATE groups
SET nom={?}, diminutif={?}, cat={?}, dom={?},
}
}
- pl_redirect('../'.Post::v('diminutif', $globals->asso('diminutif')).'/edit');
+ pl_redirect('../' . Post::v('diminutif', $globals->asso('diminutif')) . '/edit');
}
if (S::admin()) {
- $dom = XDB::iterator('SELECT * FROM group_dom ORDER BY nom');
+ $dom = XDB::iterator('SELECT *
+ FROM group_dom
+ ORDER BY nom');
$page->assign('dom', $dom);
$page->assign('super', true);
}
{
global $globals;
- if ($action == 'search') {
- http_redirect("https://www.polytechnique.org/search/adv?rechercher=Chercher&groupex={$globals->asso('id')}"
- . "&cityid=" . Env::v('cityid') . "&mapid=" . Env::v('mapid'));
- } else if ($action == 'geoloc' || $action == 'trombi') {
- $view = new UserSet();
+ if ($action == 'trombi') {
+ __autoload('userset');
+ if ($action == 'trombi') {
+ $view = new ProfileSet(new UFC_Group($globals->asso('id')));
+ } else {
+ $view = new UserSet(new UFC_Group($globals->asso('id')));
+ }
$view->addMod('trombi', 'Trombinoscope');
- // 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;
- }
+ $page->changeTpl('xnetgrp/annuaire.tpl');
+ return;
}
- $page->changeTpl('xnetgrp/annuaire.tpl');
+ $page->changeTpl('xnetgrp/annuaire.tpl');
$sort = Env::s('order', 'directory_name');
$ofs = Env::i('offset');
if ($ofs < 0) {
}
if (Env::b('admin')) {
- $uf = $globals->asso()->getAdmins(null, $se);
+ $uf = $globals->asso()->getAdminsFilter(null, $se);
} else {
- $uf = $globals->asso()->getMembers(null, $se);
+ $uf = $globals->asso()->getMembersFilter(null, $se);
}
$users = $uf->getUsers(new PlLimit(NB_PER_PAGE, $ofs * NB_PER_PAGE));
$count = $uf->getTotalCount();
{
global $globals;
$vcard = new VCard($photos == 'photos', 'Membre du groupe ' . $globals->asso('nom'));
- $vcard->addProfiles($globals->asso()->getMembers()->getProfiles());
+ $vcard->addProfiles($globals->asso()->getMembersFilter()->getProfiles());
$vcard->show();
}
if (is_null($filename)) {
$filename = $globals->asso('diminutif') . '.csv';
}
- $users = $globals->asso()->getMembers(null, new UFO_Name('directory_name'))->getUsers();
+ $users = $globals->asso()->getMembersFilter(null, new UFO_Name('directory_name'))->getUsers();
header('Content-Type: text/x-csv; charset=utf-8;');
header('Pragma: ');
header('Cache-Control: ');
if ($globals->asso('notif_unsub')) {
$mailer = new PlMailer('xnetgrp/unsubscription-notif.mail.tpl');
- foreach ($globals->asso()->getMembers()->getUsers() as $user) {
- $mailer->addTo($user);
+ $admins = $globals->asso()->iterAdmins();
+ while ($admin = $admins->next()) {
+ $mailer->addTo($admin);
}
$mailer->assign('group', $globals->asso('nom'));
$mailer->assign('user', $user);
$may_update = may_update();
$warning = false;
- foreach ($listes as $liste) {
- if ($liste['sub'] == 2) {
- if ($may_update) {
- $mmlist->mass_unsubscribe($liste['list'], Array($user->forlifeEmail()));
- } else {
- $mmlist->unsubscribe($liste['list']);
+ if (is_array($listes)) {
+ foreach ($listes as $liste) {
+ if ($liste['sub'] == 2) {
+ if ($may_update) {
+ $mmlist->mass_unsubscribe($liste['list'], Array($user->forlifeEmail()));
+ } else {
+ $mmlist->unsubscribe($liste['list']);
+ }
+ } elseif ($liste['sub']) {
+ Platal::page()->trigWarning($user->fullName() . " a une"
+ ." demande d'inscription en cours sur la"
+ ." liste {$liste['list']}@ !");
+ $warning = true;
}
- } elseif ($liste['sub']) {
- Platal::page()->trigWarning($user->fullName() . " a une"
- ." demande d'inscription en cours sur la"
- ." liste {$liste['list']}@ !");
- $warning = true;
}
}
WHERE a.alias = {?}",
$login);
if ($res->numRows() == 0) {
- // TODO: replace this call to a removed function.
- $x = get_not_registered_user($login);
- if (!$x) {
- $page->trigError("Le login $login ne correspond à aucun X.");
+ $accounts = User::getPendingAccounts($login);
+ if (!$accounts) {
+ $page->trigError("L'identifiant $login ne correspond à aucun X.");
return false;
- } else if (count($x) > 1) {
- $page->trigError("Le login $login correspond a plusieurs camarades.");
+ } else if (count($accounts) > 1) {
+ $page->trigError("L'identifiant $login correspond à plusieurs camarades.");
return false;
}
- $uid = $x[0]['user_id'];
+ $uid = $accounts[0]['uid'];
$sub = false;
} else {
list($uid, $login) = $res->fetchOneRow();
$art['prenom'] = S::v('prenom');
$art['promo'] = S::v('promo');
$art['hruid'] = S::user()->login();
- $art['peremption'] = Post::v('peremption');
+ $art['expiration'] = Post::v('expiration');
$art['public'] = Post::has('public');
$art['xorg'] = Post::has('xorg');
$art['nl'] = Post::has('nl');
$art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80));
}*/
XDB::query('INSERT INTO group_announces (uid, asso_id, create_date, titre, texte, contacts,
- peremption, promo_min, promo_max, flags, post_id)
+ expiration, 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, $flags, $post);
+ $art['expiration'], $promo_min, $promo_max, $flags, $post);
$aid = XDB::insertId();
if ($art['photo']) {
list($imgx, $imgy, $imgtype) = $upload->imageInfo();
if ($art['xorg']) {
require_once('validations.inc.php');
$article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'], $fulltext,
- $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::user(),
+ $art['promo_min'], $art['promo_max'], $art['expiration'], "", S::user(),
$upload);
$article->submit();
$page->trigWarning("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation.");
}
} else {
XDB::query('UPDATE group_announces
- SET titre = {?}, texte = {?}, contacts = {?}, peremption = {?},
+ SET titre = {?}, texte = {?}, contacts = {?}, expiration = {?},
promo_min = {?}, promo_max = {?}, flags = {?}
WHERE id = {?} AND asso_id = {?}',
- $art['titre'], $art['texte'], $art['contacts'], $art['peremption'],
+ $art['titre'], $art['texte'], $art['contacts'], $art['expiration'],
$promo_min, $promo_max, $flags,
$art['id'], $globals->asso('id'));
if ($art['photo'] && $upload->exists()) {
WHERE id = {?} AND asso_id = {?}',
Env::i('del'), $globals->asso('id'));
}
- $res = XDB::iterator('SELECT id, titre, peremption, peremption < CURRENT_DATE() AS perime
+ $res = XDB::iterator('SELECT id, titre, expiration, expiration < CURRENT_DATE() AS perime
FROM group_announces
WHERE asso_id = {?}
- ORDER BY peremption DESC',
+ ORDER BY expiration DESC',
$globals->asso('id'));
$page->assign('articles', $res);
}
projects / platal.git / blobdiff