<?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 *
function handlers()
{
return array(
- 'nl' => $this->make_hook('nl', AUTH_COOKIE),
- 'nl/show' => $this->make_hook('nl_show', AUTH_COOKIE),
- 'nl/submit' => $this->make_hook('nl_submit', AUTH_MDP),
- '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'),
+ 'nl' => $this->make_hook('nl', AUTH_COOKIE),
+ 'nl/show' => $this->make_hook('nl_show', AUTH_COOKIE),
+ 'nl/submit' => $this->make_hook('nl_submit', 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('delete', AUTH_MDP, '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'),
);
}
- function handler_nl(&$page, $action = null)
+ /** This function should return the adequate NewsLetter object for the current module.
+ */
+ protected function getNl()
{
require_once 'newsletter.inc.php';
+ return NewsLetter::forGroup(NewsLetter::GROUP_XORG);
+ }
+
+ function handler_nl($page, $action = null, $hash = null)
+ {
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
$page->changeTpl('newsletter/index.tpl');
$page->setTitle('Lettres mensuelles');
switch ($action) {
- case 'out': NewsLetter::unsubscribe(); break;
- case 'in': NewsLetter::subscribe(); break;
+ case 'out': $nl->unsubscribe($hash, $hash != null); break;
+ case 'in': $nl->subscribe(); break;
default: ;
}
- $page->assign('nls', NewsLetter::subscriptionState());
- $page->assign('nl_list', NewsLetter::listSent());
+ $page->assign_by_ref('nl', $nl);
+ $page->assign('nls', $nl->subscriptionState());
+ $page->assign('nl_list', $nl->listSentIssues(true));
}
- function handler_nl_show(&$page, $nid = 'last')
+ function handler_nl_show($page, $nid = 'last')
{
$page->changeTpl('newsletter/show.tpl');
-
- require_once 'newsletter.inc.php';
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
try {
- $nl = new NewsLetter($nid);
+ $issue = $nl->getIssue($nid);
+ $user =& S::user();
if (Get::has('text')) {
- $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+ $issue->toText($page, $user);
} else {
- $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+ $issue->toHtml($page, $user);
}
if (Post::has('send')) {
- $res = XDB::query("SELECT hash
- FROM newsletter_ins
- WHERE user_id = {?}",
- S::i('uid'));
- $nl->sendTo(S::user()->login(), S::user()->bestEmail(),
- S::v('prenom'), S::v('nom'),
- S::v('femme'), S::v('mail_fmt') != 'texte',
- $res->fetchOneCell());
+ $issue->sendTo($user);
}
} catch (MailNotFound $e) {
return PL_NOT_FOUND;
}
}
- function handler_nl_submit(&$page)
+ function handler_nl_submit($page)
{
$page->changeTpl('newsletter/submit.tpl');
- require_once 'newsletter.inc.php';
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
+
$wp = new PlWikiPage('Xorg.LettreMensuelle');
$wp->buildCache();
$art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'));
$page->assign('art', $art);
} elseif (Post::has('valid')) {
- require_once('validations.inc.php');
$art = new NLReq(S::user(), Post::v('title'),
Post::v('body'), Post::v('append'));
$art->submit();
$page->assign('submited', true);
}
- $page->addCssLink('nl.css');
+ $page->addCssLink($nl->cssFile());
}
- function handler_admin_nl(&$page, $new = false) {
+ function handler_admin_nl($page, $new = false) {
$page->changeTpl('newsletter/admin.tpl');
$page->setTitle('Administration - Newsletter : liste');
- require_once("newsletter.inc.php");
- if($new) {
- NewsLetter::create();
- pl_redirect("admin/newsletter");
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
+
+ if ($new == 'new') {
+ $id = $nl->createPending();
+ pl_redirect($nl->adminPrefix() . '/edit/' . $id);
}
- $page->assign('nl_list', NewsLetter::listAll());
+ $page->assign_by_ref('nl', $nl);
+ $page->assign('nl_list', $nl->listAllIssues());
}
- function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
+ function handler_admin_nl_groups($page)
+ {
+ require_once 'newsletter.inc.php';
+
+ $page->changeTpl('newsletter/admin_all.tpl');
+ $page->setTitle('Administration - Newsletters : Liste des Newsletters');
+
+ $page->assign('nls', Newsletter::getAll());
+ }
+
+ function handler_admin_nl_edit($page, $nid = 'last', $aid = null, $action = 'edit') {
$page->changeTpl('newsletter/edit.tpl');
- $page->addCssLink('nl.css');
+ $page->addCssLink('nl.Polytechnique.org.css');
$page->setTitle('Administration - Newsletter : Édition');
- require_once 'newsletter.inc.php';
- $nl = new NewsLetter($nid);
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
- if($action == 'delete') {
- $nl->delArticle($aid);
- pl_redirect("admin/newsletter/edit/$nid");
- }
-
- if($aid == 'update') {
- $nl->_title = Post::v('title');
- $nl->_title_mail = Post::v('title_mail');
- $nl->_date = Post::v('date');
- $nl->_head = Post::v('head');
- $nl->_shortname = strlen(Post::v('shortname')) ? Post::v('shortname') : null;
- if (preg_match('/^[-a-z0-9]*$/i', $nl->_shortname) && !is_numeric($nl->_shortname)) {
- $nl->save();
- } else {
- $page->trigError("Le nom de la NL n'est pas valide.");
- pl_redirect('admin/newsletter/edit/' . $nl->_id);
+ try {
+ $issue = $nl->getIssue($nid, false);
+ } catch (MailNotFound $e) {
+ return PL_NOT_FOUND;
+ }
+
+ $ufb = $nl->getSubscribersUFB();
+ $ufb_keepenv = false; // Will be set to True if there were invalid modification to the UFB.
+
+ // Convert NLIssue error messages to human-readable errors
+ $error_msgs = array(
+ NLIssue::ERROR_INVALID_SHORTNAME => "Le nom court est invalide ou vide.",
+ NLIssue::ERROR_INVALID_UFC => "Le filtre des destinataires est invalide.",
+ NLIssue::ERROR_SQL_SAVE => "Une erreur est survenue en tentant de sauvegarder la lettre, merci de réessayer.",
+ );
+
+ // Update the current issue
+ if($aid == 'update' && Post::has('submit')) {
+
+ // Save common fields
+ $issue->title = Post::s('title');
+ $issue->title_mail = Post::s('title_mail');
+ $issue->head = Post::s('head');
+ $issue->signature = Post::s('signature');
+
+ if ($issue->isEditable()) {
+ // Date and shortname may only be modified for pending NLs, otherwise all links get broken.
+ $issue->date = Post::s('date');
+ $issue->shortname = strlen(Post::blank('shortname')) ? null : Post::s('shortname');
+ $issue->sufb->updateFromEnv($ufb->getEnv());
+
+ if ($nl->automaticMailingEnabled()) {
+ $issue->send_before = preg_replace('/^(\d\d\d\d)(\d\d)(\d\d)$/', '\1-\2-\3', Post::v('send_before_date')) . ' ' . Post::i('send_before_time_Hour') . ':00:00';
+ }
+ }
+ $errors = $issue->save();
+ if (count($errors)) {
+ foreach ($errors as $error_code) {
+ $page->trigError($error_msgs[$error_code]);
+ }
}
}
+ // Delete an article
+ if($action == 'delete') {
+ $issue->delArticle($aid);
+ pl_redirect($nl->adminPrefix() . "/edit/$nid");
+ }
+
+ // Save an article
if(Post::v('save')) {
$art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
$aid, Post::v('cid'), Post::v('pos'));
- $nl->saveArticle($art);
- pl_redirect("admin/newsletter/edit/$nid");
+ $issue->saveArticle($art);
+ pl_redirect($nl->adminPrefix() . "/edit/$nid");
}
+ // Edit an article
if ($action == 'edit' && $aid != 'update') {
$eaid = $aid;
- if(Post::has('title')) {
+ if (Post::has('title')) {
$art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
$eaid, Post::v('cid'), Post::v('pos'));
} else {
- $art = ($eaid == 'new') ? new NLArticle() : $nl->getArt($eaid);
+ $art = ($eaid == 'new') ? new NLArticle() : $issue->getArt($eaid);
+ }
+ if ($art && !$art->check()) {
+ $page->trigError("Cet article est trop long.");
}
$page->assign('art', $art);
}
+ // Check blacklisted IPs
if ($aid == 'blacklist_check') {
global $globals;
$ips_to_check = array();
$blacklist_host_resolution_count = 0;
- foreach ($nl->_arts as $key => $articles) {
+ foreach ($issue->arts as $key => $articles) {
foreach ($articles as $article) {
$article_ips = $article->getLinkIps($blacklist_host_resolution_count);
if (!empty($article_ips)) {
}
}
+ if ($issue->state == NLIssue::STATE_SENT) {
+ $page->trigWarning("Cette lettre a déjà été envoyée ; il est recommandé de limiter les modifications au maximum (orthographe, adresses web et mail).");
+ }
+
+ $ufb->setEnv($issue->sufb->getEnv());
$page->assign_by_ref('nl', $nl);
+ $page->assign_by_ref('issue', $issue);
+ }
+
+ /** This handler will cancel the sending of the currently pending issue
+ * It is disabled for X.org mailings.
+ */
+ function handler_admin_nl_cancel($page, $nid, $force = null)
+ {
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
+
+ if (!$nl->mayEdit() || !S::has_xsrf_token()) {
+ return PL_FORBIDDEN;
+ }
+
+ if (!$nid) {
+ $page->kill("La lettre n'a pas été spécifiée");
+ }
+
+ $issue = $nl->getIssue($nid);
+ if (!$issue) {
+ $page->kill("La lettre {$nid} n'existe pas.");
+ }
+ if (!$issue->cancelMailing()) {
+ $page->trigErrorRedirect("Une erreur est survenue lors de l'annulation de l'envoi.", $nl->adminPrefix());
+ }
+
+ $page->trigSuccessRedirect("L'envoi de l'annonce {$issue->title()} est annulé.", $nl->adminPrefix());
+ }
+
+ /** This handler will enable the sending of the currently pending issue
+ * It is disabled for X.org mailings.
+ */
+ function handler_admin_nl_valid($page, $nid, $force = null)
+ {
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
+
+ if (!$nl->mayEdit() || !S::has_xsrf_token()) {
+ return PL_FORBIDDEN;
+ }
+
+ if (!$nid) {
+ $page->kill("La lettre n'a pas été spécifiée.");
+ }
+
+ $issue = $nl->getIssue($nid);
+ if (!$issue) {
+ $page->kill("La lettre {$nid} n'existe pas.");
+ }
+ if (!$issue->scheduleMailing()) {
+ $page->trigErrorRedirect("Une erreur est survenue lors de la validation de l'envoi.", $nl->adminPrefix());
+ }
+
+ $page->trigSuccessRedirect("L'envoi de la newsletter {$issue->title()} a été validé.", $nl->adminPrefix());
+ }
+
+ /** This handler will remove the given issue.
+ */
+ function handler_admin_nl_delete($page, $nid, $force = null)
+ {
+ $nl = $this->getNl();
+ if (!$nl) {
+ return PL_NOT_FOUND;
+ }
+
+ if (!$nl->mayEdit() || !S::has_xsrf_token()) {
+ return PL_FORBIDDEN;
+ }
+
+ if (!$nid) {
+ $page->kill("La lettre n'a pas été spécifiée.");
+ }
+
+ $issue = $nl->getIssue($nid);
+ if (!$issue) {
+ $page->kill("La lettre {$nid} n'existe pas");
+ }
+ if (!$issue->isEditable()) {
+ $page->trigErrorRedirect("La lette a été envoyée ou est en cours d'envoi, elle ne peut être supprimée.", $nl->adminPrefix());
+ }
+ if (!$issue->delete()) {
+ $page->trigErrorRedirect("Une erreur est survenue lors de la suppression de la lettre.", $nl->adminPrefix());
+ }
+
+ $page->trigSuccessRedirect("La lettre a bien été supprimée.", $nl->adminPrefix());
}
- function handler_admin_nl_cat(&$page, $action = 'list', $id = null) {
+ function handler_admin_nl_cat($page, $action = 'list', $id = null) {
$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->describe('titre','intitulé',true);
+ $table_editor->describe('title','intitulé',true);
$table_editor->describe('pos','position',true);
$table_editor->apply($page, $action, $id);
}
projects / platal.git / blobdiff