X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fnewsletter.php;h=ff3f749dbaa63f5c7a0617442d0fdb387c8df8e7;hb=6f9358f44cc8bcbba718c52a1b3e0bb4d70d0f13;hp=3accf5fcd36ecea2076ad6ab86d3f0e2d6f848e4;hpb=602119a260d65a6a9d146e01d43bc21358d706d9;p=platal.git diff --git a/modules/newsletter.php b/modules/newsletter.php index 3accf5f..ff3f749 100644 --- a/modules/newsletter.php +++ b/modules/newsletter.php @@ -24,19 +24,19 @@ class NewsletterModule extends PLModule function handlers() { return array( - 'nl' => $this->make_hook('nl', AUTH_COOKIE), - 'nl/show' => $this->make_hook('nl_show', AUTH_COOKIE), - 'nl/search' => $this->make_hook('nl_search', AUTH_COOKIE), - 'nl/submit' => $this->make_hook('nl_submit', AUTH_MDP), - 'nl/remaining' => $this->make_hook('nl_remaining', AUTH_MDP), - 'admin/nls' => $this->make_hook('admin_nl_groups', AUTH_MDP, 'admin'), - 'admin/newsletter' => $this->make_hook('admin_nl', AUTH_MDP, 'admin'), - 'admin/newsletter/categories' => $this->make_hook('admin_nl_cat', AUTH_MDP, 'admin'), - 'admin/newsletter/edit' => $this->make_hook('admin_nl_edit', AUTH_MDP, 'admin'), - 'admin/newsletter/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_MDP, 'admin'), + 'nl' => $this->make_hook('nl', AUTH_COOKIE, 'user'), + 'nl/show' => $this->make_hook('nl_show', AUTH_COOKIE, 'user'), + 'nl/search' => $this->make_hook('nl_search', AUTH_COOKIE, 'user'), + 'nl/submit' => $this->make_hook('nl_submit', AUTH_PASSWD, 'user'), + 'nl/remaining' => $this->make_hook('nl_remaining', AUTH_PASSWD, 'user'), + 'admin/nls' => $this->make_hook('admin_nl_groups', AUTH_PASSWD, 'admin'), + 'admin/newsletter' => $this->make_hook('admin_nl', AUTH_PASSWD, 'admin'), + 'admin/newsletter/categories' => $this->make_hook('admin_nl_cat', AUTH_PASSWD, 'admin'), + 'admin/newsletter/edit' => $this->make_hook('admin_nl_edit', AUTH_PASSWD, 'admin'), + 'admin/newsletter/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_PASSWD, 'admin'), // Automatic mailing is disabled for X.org NL -// 'admin/newsletter/edit/cancel' => $this->make_hook('cancel', AUTH_MDP, 'admin'), -// 'admin/newsletter/edit/valid' => $this->make_hook('valid', AUTH_MDP, 'admin'), +// 'admin/newsletter/edit/cancel' => $this->make_hook('cancel', AUTH_PASSWD, 'admin'), +// 'admin/newsletter/edit/valid' => $this->make_hook('valid', AUTH_PASSWD, 'admin'), ); } @@ -55,16 +55,26 @@ class NewsletterModule extends PLModule return PL_NOT_FOUND; } - $page->changeTpl('newsletter/index.tpl'); - $page->setTitle('Lettres mensuelles'); - $hash = ($hash == 'nohash') ? null : $hash; switch ($action) { - case 'out': $nl->unsubscribe($issue_id, $hash, $hash != null); break; + case 'out': + $success = $nl->unsubscribe($issue_id, $hash, $hash != null); + if (!is_null($hash)) { + if ($success) { + $page->trigSuccess('La désinscription a été effectuée avec succès.'); + } else { + $page->trigError("La désinscription n'a été pas pu être effectuée."); + } + return; + } + break; case 'in': $nl->subscribe(); break; default: ; } + $page->changeTpl('newsletter/index.tpl'); + $page->setTitle('Lettres mensuelles'); + $page->assign_by_ref('nl', $nl); $page->assign('nls', $nl->subscriptionState()); $page->assign('nl_list', $nl->listSentIssues(true)); @@ -103,7 +113,7 @@ class NewsletterModule extends PLModule } if (!Post::has('nl_search')) { - pl_redirect($nl->prefix()); + pl_redirect($nl->prefix(true, false)); } $nl_search = Post::t('nl_search'); @@ -199,7 +209,7 @@ class NewsletterModule extends PLModule S::logger()->log('nl_issue_create', $nid); $id = $nl->createPending(); - pl_redirect($nl->adminPrefix() . '/edit/' . $id); + pl_redirect($nl->adminPrefix(true, false) . '/edit/' . $id); } $page->assign_by_ref('nl', $nl); @@ -237,6 +247,7 @@ class NewsletterModule extends PLModule // Convert NLIssue error messages to human-readable errors $error_msgs = array( + NLIssue::ERROR_INVALID_REPLY_TO => "L'adresse de réponse est invalide.", NLIssue::ERROR_INVALID_SHORTNAME => "Le nom court est invalide ou vide.", NLIssue::ERROR_INVALID_UFC => "Le filtre des destinataires est invalide.", NLIssue::ERROR_TOO_LONG_UFC => "Le nombre de matricules AX renseigné est trop élevé.", @@ -251,6 +262,7 @@ class NewsletterModule extends PLModule $issue->title_mail = Post::s('title_mail'); $issue->head = Post::s('head'); $issue->signature = Post::s('signature'); + $issue->reply_to = Post::s('reply_to'); if ($issue->isEditable()) { // Date and shortname may only be modified for pending NLs, otherwise all links get broken. @@ -273,7 +285,7 @@ class NewsletterModule extends PLModule // Delete an article if($action == 'delete') { $issue->delArticle($aid); - pl_redirect($nl->adminPrefix() . "/edit/$nid"); + pl_redirect($nl->adminPrefix(true, false) . "/edit/$nid"); } // Save an article @@ -281,7 +293,7 @@ class NewsletterModule extends PLModule $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'), $aid, Post::v('cid'), Post::v('pos')); $issue->saveArticle($art); - pl_redirect($nl->adminPrefix() . "/edit/$nid"); + pl_redirect($nl->adminPrefix(true, false) . "/edit/$nid"); } // Edit an article @@ -431,11 +443,30 @@ class NewsletterModule extends PLModule } function handler_admin_nl_cat($page, $action = 'list', $id = null) { + $nl = $this->getNl(); + if (!$nl) { + return PL_NOT_FOUND; + } + + if (!$nl->mayEdit()) { + return PL_FORBIDDEN; + } + $page->setTitle('Administration - Newsletter : Catégories'); $page->assign('title', 'Gestion des catégories de la newsletter'); - $table_editor = new PLTableEditor('admin/newsletter/categories','newsletter_cat','cid'); + $table_editor = new PLTableEditor($nl->adminPrefix() . '/categories', 'newsletter_cat','cid'); $table_editor->describe('title','intitulé',true); $table_editor->describe('pos','position',true); + if ($nl->group == Newsletter::GROUP_XORG) { + $table_editor->add_option_table('newsletters', 'newsletters.id = t.nlid'); + $table_editor->add_option_field('newsletters.name', 'newsletter_name', 'Newsletter', null, 'nlid'); + $table_editor->describe('nlid', 'ID NL', true); + } else { + $table_editor->force_field_value('nlid', $nl->id); + $table_editor->describe('nlid', 'nlid', false, false); + } + // Prevent deletion. + $table_editor->on_delete(null, null); $table_editor->apply($page, $action, $id); } }