X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=60ca0ee9cb0f845402c5dcf559c6a288f70bb254;hb=6bc4c6ef44c78ac6b9520ac1a8d9d4720a3828e2;hp=d50eeb2224c494532572aab556c405c334218491;hpb=93d42b4fcc6f055a428c9b63e386ac62c918d08a;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index d50eeb2..60ca0ee 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -1,6 +1,6 @@ $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), @@ -43,11 +43,11 @@ class ListsModule extends PLModule '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'), ); } - function prepare_client(&$page, $user = null) + function prepare_client($page, $user = null) { global $globals; @@ -76,7 +76,7 @@ class ListsModule extends PLModule return array($subs, $mails); } - function handler_lists(&$page) + function handler_lists($page) { function filter_owner($list) { @@ -91,7 +91,6 @@ class ListsModule extends PLModule $domain = $this->prepare_client($page); $page->changeTpl('lists/index.tpl'); - $page->addJsLink('ajax.js'); $page->setTitle('Listes de diffusion'); @@ -112,7 +111,7 @@ class ListsModule extends PLModule 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."); } } @@ -133,7 +132,7 @@ class ListsModule extends PLModule } } - function handler_ajax(&$page, $list = null) + function handler_ajax($page, $list = null) { pl_content_headers("text/html"); $domain = $this->prepare_client($page); @@ -163,20 +162,26 @@ class ListsModule extends PLModule $page->assign_by_ref('liste', $liste); } - function handler_create(&$page) + function handler_create($page) { global $globals; $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); @@ -295,7 +300,6 @@ class ListsModule extends PLModule 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'), @@ -304,7 +308,7 @@ class ListsModule extends PLModule } } - function handler_members(&$page, $liste = null) + function handler_members($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -343,24 +347,22 @@ class ListsModule extends PLModule } } - function handler_csv(PlPage &$page, $liste = null) + function handler_csv(PlPage $page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; } $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; } - function handler_annu(&$page, $liste = null, $action = null, $subaction = null) + function handler_annu($page, $liste = null, $action = null, $subaction = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -409,7 +411,7 @@ class ListsModule extends PLModule $page->assign_by_ref('owners', $moderos); } - function handler_archives(&$page, $liste = null, $action = null, $artid = null) + function handler_archives($page, $liste = null, $action = null, $artid = null) { global $globals; @@ -438,7 +440,7 @@ class ListsModule extends PLModule } } - function handler_rss(&$page, $liste = null, $alias = null, $hash = null) + function handler_rss($page, $liste = null, $alias = null, $hash = null) { if (!$liste) { return PL_NOT_FOUND; @@ -478,7 +480,7 @@ class ListsModule extends PLModule $liste, $domain, $mid, S::i('uid'), $action, Post::v('reason')); } - function handler_moderate(&$page, $liste = null) + function handler_moderate($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -509,8 +511,7 @@ class ListsModule extends PLModule $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'); } @@ -582,8 +583,7 @@ class ListsModule extends PLModule { 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(); @@ -597,7 +597,7 @@ class ListsModule extends PLModule } } - function handler_admin(&$page, $liste = null) + function handler_admin($page, $liste = null) { global $globals; @@ -730,7 +730,7 @@ class ListsModule extends PLModule } } - function handler_options(&$page, $liste = null) + function handler_options($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -797,7 +797,7 @@ class ListsModule extends PLModule } } - function handler_delete(&$page, $liste = null) + function handler_delete($page, $liste = null) { global $globals; if (is_null($liste)) { @@ -844,7 +844,7 @@ class ListsModule extends PLModule } } - function handler_soptions(&$page, $liste = null) + function handler_soptions($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -873,7 +873,7 @@ class ListsModule extends PLModule } } - function handler_check(&$page, $liste = null) + function handler_check($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -896,7 +896,7 @@ class ListsModule extends PLModule } } - function handler_admin_all(&$page) + function handler_admin_all($page) { $page->changeTpl('lists/admin_all.tpl'); $page->setTitle('Administration - Mailing lists');