Happy New Year!

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index 3e85e72..55fe39b 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
 <?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   *
@@ -27,8 +27,8 @@ class ListsModule extends PLModule
     {
         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),
@@ -43,7 +43,7 @@ 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'),
         );
     }
 
@@ -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.");
             }
         }
 
@@ -169,14 +168,20 @@ class ListsModule extends PLModule
 
         $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&nbsp;!');
             $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'),
@@ -350,13 +354,11 @@ class ListsModule extends PLModule
         }
         $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;
     }
 
@@ -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');
                 }