Fixes education inclusion.

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index eeeb2d4..5587714 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -26,23 +26,23 @@ class ListsModule extends PLModule
     function handlers()
     {
         return array(
-            'lists'           => $this->make_hook('lists',     AUTH_MDP, 'lists'),
-            'lists/ajax'      => $this->make_hook('ajax',      AUTH_MDP, 'lists', NO_AUTH),
+            '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'),
 
-            'lists/members'   => $this->make_hook('members',   AUTH_COOKIE, 'lists'),
-            'lists/csv'       => $this->make_hook('csv',       AUTH_COOKIE, 'lists'),
-            'lists/annu'      => $this->make_hook('annu',      AUTH_COOKIE, 'lists'),
-            'lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE, 'lists'),
-            'lists/archives/rss' => $this->make_hook('rss',    AUTH_PUBLIC, 'lists', NO_HTTPS),
+            'lists/members'   => $this->make_hook('members',   AUTH_COOKIE),
+            'lists/csv'       => $this->make_hook('csv',       AUTH_COOKIE),
+            'lists/annu'      => $this->make_hook('annu',      AUTH_COOKIE),
+            'lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE),
+            'lists/archives/rss' => $this->make_hook('rss',    AUTH_PUBLIC, 'user', NO_HTTPS),
 
-            'lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP, 'lists'),
-            'lists/admin'     => $this->make_hook('admin',     AUTH_MDP, 'lists'),
-            'lists/options'   => $this->make_hook('options',   AUTH_MDP, 'lists'),
-            'lists/delete'    => $this->make_hook('delete',    AUTH_MDP, 'lists'),
+            'lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP),
+            'lists/admin'     => $this->make_hook('admin',     AUTH_MDP),
+            'lists/options'   => $this->make_hook('options',   AUTH_MDP),
+            'lists/delete'    => $this->make_hook('delete',    AUTH_MDP),
 
-            'lists/soptions'  => $this->make_hook('soptions',  AUTH_MDP, 'lists'),
-            'lists/check'     => $this->make_hook('check',     AUTH_MDP, 'lists'),
+            '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'),
         );
     }
@@ -301,7 +301,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'),
@@ -513,8 +512,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');
                 }