<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
{
return array(
'lists' => $this->make_hook('lists', AUTH_MDP),
- 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH),
- 'lists/create' => $this->make_hook('create', AUTH_MDP),
+ 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH),
+ 'lists/create' => $this->make_hook('create', AUTH_MDP, 'lists'),
'lists/members' => $this->make_hook('members', AUTH_COOKIE),
'lists/csv' => $this->make_hook('csv', AUTH_COOKIE),
'lists/soptions' => $this->make_hook('soptions', AUTH_MDP),
'lists/check' => $this->make_hook('check', AUTH_MDP),
- 'admin/lists' => $this->make_hook('admin_all', AUTH_MDP, 'admin'),
+ 'admin/lists' => $this->make_hook('admin_all', AUTH_MDP, 'admin'),
);
}
{
list($subs,$mails) = $this->client->get_pending_ops($list);
$res = XDB::query("SELECT mid
- FROM ml_moderate
+ FROM email_list_moderate
WHERE ml = {?} AND domain = {?}",
$list, $domain);
$mids = $res->fetchColumn();
$domain = $this->prepare_client($page);
$page->changeTpl('lists/index.tpl');
- $page->addJsLink('ajax.js');
$page->setTitle('Listes de diffusion');
if ($promo >= 1900 and $promo < 2100) {
$this->client->subscribe("promo$promo");
} else {
- $page->trigSuccess("promo incorrecte, il faut une promo sur 4 chiffres.");
+ $page->trigError("promo incorrecte, il faut une promo sur 4 chiffres.");
}
}
- $listes = $this->client->get_lists();
- $owner = array_filter($listes, 'filter_owner');
- $listes = array_diff_key($listes, $owner);
- $member = array_filter($listes, 'filter_member');
- $listes = array_diff_key($listes, $member);
- foreach ($owner as $key=>$liste) {
- list($subs,$mails) = $this->get_pending_ops($domain, $liste['list']);
- $owner[$key]['subscriptions'] = $subs;
- $owner[$key]['mails'] = $mails;
+ if (!is_null($listes = $this->client->get_lists())) {
+ $owner = array_filter($listes, 'filter_owner');
+ $listes = array_diff_key($listes, $owner);
+ $member = array_filter($listes, 'filter_member');
+ $listes = array_diff_key($listes, $member);
+ foreach ($owner as $key => $liste) {
+ list($subs, $mails) = $this->get_pending_ops($domain, $liste['list']);
+ $owner[$key]['subscriptions'] = $subs;
+ $owner[$key]['mails'] = $mails;
+ }
+ $page->register_modifier('hdc', 'list_header_decode');
+ $page->assign_by_ref('owner', $owner);
+ $page->assign_by_ref('member', $member);
+ $page->assign_by_ref('public', $listes);
}
- $page->register_modifier('hdc', 'list_header_decode');
- $page->assign_by_ref('owner', $owner);
- $page->assign_by_ref('member', $member);
- $page->assign_by_ref('public', $listes);
}
function handler_ajax(&$page, $list = null)
$page->changeTpl('lists/create.tpl');
- $user_promo = S::i('promo');
+ $user_promo = S::user()->profile()->yearPromo();
$year = date('Y');
$month = date('m');
+ // scolar year starts in september
+ $scolarmonth = ($year - $user_promo) * 12 + ($month - 8);
$young_promo = $very_young_promo = 0;
- if ((($year > $user_promo) && ($month > 3)) && ($year < $user_promo + 5)) {
+ // binet are accessible only in april in the first year and until
+ // march of the 5th year
+ if ($scolarmonth >= 8 && $scolarmonth < 56) {
$young_promo = 1;
}
- if ((($year > $user_promo) && ($month > 7)) && (($year < $user_promo + 1) && ($month < 8))) {
+ // PSC aliases are accesible only between september and june of the second
+ // year of scolarity
+ if ($scolarmonth >= 12 && $scolarmonth < 22) {
$very_young_promo = 1;
}
$page->assign('young_promo', $young_promo);
if (!$page->nb_errs()) {
$page->trigSuccess('Demande de création envoyée !');
$page->assign('created', true);
- require_once 'validations.inc.php';
$req = new ListeReq(S::user(), $asso, $liste, $domain,
Post::v('desc'), Post::i('advertise'),
Post::i('modlevel'), Post::i('inslevel'),
}
$this->prepare_client($page);
$members = $this->client->get_members($liste);
- $list = list_fetch_names(list_extract_members($members[1]));
- pl_content_headers("text/x-csv");
+ $list = list_fetch_basic_info(list_extract_members($members[1]));
+ pl_cached_content_headers('text/x-csv', 1);
- echo "email,nom,prenom,promo\n";
- foreach ($list as $member) {
- echo @$member['email'] . ',' . @$member['nom'] . ',' . @$member['prenom'] . ',' . @$member['promo'] . "\n";
- }
+ echo "email,nom,promo\n";
+ echo implode("\n", $list);
exit;
}
return false;
}
Get::kill('mid');
- return XDB::execute("INSERT IGNORE INTO ml_moderate
+ return XDB::execute("INSERT IGNORE INTO email_list_moderate
VALUES ({?}, {?}, {?}, {?}, {?}, NOW(), {?}, NULL)",
$liste, $domain, $mid, S::i('uid'), $action, Post::v('reason'));
}
$mailer->addTo("$liste-owner@{$domain}");
$mailer->addHeader('Reply-To', "$liste-owner@{$domain}");
$mailer->setSubject("L'inscription de {$sub['name']} a été $info");
- $text = "L'inscription de {$sub['name']} à la liste $liste@{$domain} a été $info par " . S::v('prenom') . ' '
- . S::v('nom') . '(' . S::v('promo') . ")\n";
+ $text = "L'inscription de {$sub['name']} à la liste $liste@{$domain} a été $info par " . S::user()->fullName(true) . ".\n";
if (trim(Post::v('reason'))) {
$text .= "\nLa raison invoquée est :\n" . Post::v('reason');
}
{
global $list_unregistered, $globals;
- /* TODO: fixes this call to a removed function. */
- $users = get_not_registered_user($login, true);
+ $users = User::getPendingAccounts($login, true);
if ($users && $users->total()) {
if (!isset($list_unregistered)) {
$list_unregistered = array();
projects / platal.git / blobdiff