X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter.php;h=d6a63bebfb2a1da420abc67b9e04354a4c85423a;hb=950c9968a3418444928e9ed0aa0b257b8b52634f;hp=aa9a38ac4e4a661b09b7582deb114e495d30efd4;hpb=2f95cd8f290d0e6639a30a9cbaf3230dea4ccf9d;p=platal.git
diff --git a/modules/axletter.php b/modules/axletter.php
index aa9a38a..d6a63be 100644
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -1,6 +1,6 @@
$this->make_hook('index', AUTH_COOKIE),
- 'ax/out' => $this->make_hook('out', AUTH_PUBLIC),
- 'ax/show' => $this->make_hook('show', AUTH_COOKIE),
- 'ax/edit' => $this->make_hook('submit', AUTH_MDP),
- 'ax/edit/cancel' => $this->make_hook('cancel', AUTH_MDP),
- 'ax/edit/valid' => $this->make_hook('valid', AUTH_MDP),
- 'admin/axletter' => $this->make_hook('admin', AUTH_MDP, 'admin'),
+ 'ax' => $this->make_hook('nl', AUTH_COOKIE, 'user'),
+ 'ax/out' => $this->make_hook('out', AUTH_PUBLIC),
+ 'ax/show' => $this->make_hook('nl_show', AUTH_COOKIE, 'user'),
+ 'ax/search' => $this->make_hook('nl_search', AUTH_COOKIE, 'user'),
+ 'ax/admin' => $this->make_hook('admin_nl', AUTH_MDP, 'user'),
+ 'ax/admin/edit' => $this->make_hook('admin_nl_edit', AUTH_MDP, 'user'),
+ 'ax/admin/edit/valid' => $this->make_hook('admin_nl_valid', AUTH_MDP, 'user'),
+ 'ax/admin/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_MDP, 'user'),
+ 'ax/admin/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_MDP, 'user'),
+ 'ax/admin/categories' => $this->make_hook('admin_nl_cat', AUTH_MDP, 'user'),
);
}
- function handler_out(&$page, $hash)
- {
- if (!$hash) {
- if (!S::logged()) {
- return PL_DO_AUTH;
- } else {
- return $this->handler_index($page, 'out');
- }
- }
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
- $page->changeTpl('axletter/unsubscribe.tpl');
- $page->assign('success', AXLetter::unsubscribe($hash, true));
- }
-
- function handler_index(&$page, $action = null)
- {
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
-
- $page->changeTpl('axletter/index.tpl');
- $page->assign('xorg_title','Polytechnique.org - Envois de l\'AX');
-
- switch ($action) {
- case 'in': AXLetter::subscribe(); break;
- case 'out': AXLetter::unsubscribe(); break;
- }
-
- $perm = AXLetter::hasPerms();
- if ($perm) {
- $page->assign('new', AXLetter::awaiting());
- }
- $page->assign('axs', AXLetter::subscriptionState());
- $page->assign('ax_list', AXLetter::listSent());
- $page->assign('ax_rights', $perm);
- }
-
- function handler_submit(&$page, $action = null)
- {
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
- if (!AXLetter::hasPerms()) {
- return PL_FORBIDDEN;
- }
-
- $page->changeTpl('axletter/edit.tpl');
-
- $saved = Post::i('saved');
- $new = false;
- $id = Post::i('id');
- $shortname = trim(Post::v('shortname'));
- $subject = trim(Post::v('subject'));
- $title = trim(Post::v('title'));
- $body = rtrim(Post::v('body'));
- $signature = trim(Post::v('signature'));
- $promo_min = Post::i('promo_min');
- $promo_max = Post::i('promo_max');
- $echeance = Post::has('echeance_date') ? Post::v('echeance_date') . ' ' . Post::v('echeance_time')
- : Post::v('echeance');
- $echeance_date = Post::v('echeance_date');
- $echeance_time = Post::v('echeance_time');
-
- if (!$id) {
- $res = XDB::query("SELECT * FROM axletter WHERE FIND_IN_SET('new', bits)");
- if ($res->numRows()) {
- extract($res->fetchOneAssoc(), EXTR_OVERWRITE);
- $saved = true;
- } else {
- XDB::execute("INSERT INTO axletter SET id = NULL");
- $id = XDB::insertId();
- }
- if (!$echeance || $echeance == '0000-00-00 00:00:00') {
- $saved = false;
- $new = true;
- }
- } elseif (Post::has('valid')) {
- if (!$subject && $title) {
- $subject = $title;
- }
- if (!$title && $subject) {
- $title = $subject;
- }
- if (!$subject || !$title || !$body) {
- $page->trig("L'article doit avoir un sujet et un contenu");
- Post::kill('valid');
- }
- if (($promo_min > $promo_max && $promo_max != 0)||
- ($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
- ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020)))
- {
- $page->trig("L'intervalle de promotions n'est pas valide");
- Post::kill('valid');
- }
- if (empty($shortname)) {
- $page->trig("L'annonce doit avoir un nom raccourci pour simplifier la navigation dans les archives");
- Post::kill('valid');
- } elseif (!preg_match('/^[a-z][-a-z0-9]*[a-z0-9]$/', $shortname)) {
- $page->trig("Le nom raccourci n'est pas valide, il doit comporter au moins 2 caractères et n'être composé "
- . "que de chiffres, lettres et tirets");
- Post::kill('valid');
- } elseif ($shortname != Post::v('old_shortname')) {
- $res = XDB::query("SELECT id FROM axletter WHERE shortname = {?}", $shortname);
- if ($res->numRows() && $res->fetchOneCell() != $id) {
- $page->trig("Le nom $shortname est déjà utilisé, merci d'en choisir un autre");
- $shortname = Post::v('old_shortname');
- if (empty($shortname)) {
- Post::kill('valid');
- }
- }
- }
-
- switch (@Post::v('valid')) {
- case 'Aperçu':
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
- $al = new AXLetter(array($id, $shortname, $subject, $title, $body, $signature,
- $promo_min, $promo_max, $echeance, 0, 'new'));
- $al->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
- break;
-
- case 'Confirmer':
- XDB::execute("REPLACE INTO axletter
- SET id = {?}, shortname = {?}, subject = {?}, title = {?}, body = {?},
- signature = {?}, promo_min = {?}, promo_max = {?}, echeance = {?}",
- $id, $shortname, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance);
- $saved = true;
- $echeance_date = null;
- $echeance_time = null;
- pl_redirect('ax');
- break;
- }
- }
- $page->assign('id', $id);
- $page->assign('shortname', $shortname);
- $page->assign('subject', $subject);
- $page->assign('title', $title);
- $page->assign('body', $body);
- $page->assign('signature', $signature);
- $page->assign('promo_min', $promo_min);
- $page->assign('promo_max', $promo_max);
- $page->assign('echeance', $echeance);
- $page->assign('echeance_date', $echeance_date);
- $page->assign('echeance_time', $echeance_time);
- $page->assign('saved', $saved);
- $page->assign('new', $new);
- $page->assign('is_xorg', S::has_perms());
-
- if (!$saved) {
- $select = '';
- $time = time() + 3600 * 24 * 2;
- for ($i = 0 ; $i < 15 ; $i++) {
- $time += 3600 * 24;
- $p_stamp = date('Ymd', $time);
- $year = date('Y', $time);
- $month = date('m', $time);
- $day = date('d', $time);
-
- if ($p_stamp == $echeance_date) {
- $sel = ' selected="selected"';
- } else {
- $sel = '';
- }
- $select .= "\n";
- }
- $page->assign('echeance_date', $select);
- $select = '';
- for ($i = 0 ; $i < 24 ; $i++) {
- $stamp = sprintf('%02d:00:00', $i);
- if ($stamp == $echeance_time) {
- $sel = ' selected="selected"';
- } else {
- $sel = '';
- }
- $select .= "\n";
- }
- $page->assign('echeance_time', $select);
- }
- }
-
- function handler_cancel(&$page, $force = null)
- {
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
- if (!AXLetter::hasPerms()) {
- return PL_FORBIDDEN;
- }
-
- $url = parse_url($_SERVER['HTTP_REFERER']);
- if ($force != 'force' && trim($url['path'], '/') != 'ax/edit') {
- return PL_FORBIDDEN;
- }
-
- $al = AXLetter::awaiting();
- if (!$alg) {
- $page->kill("Aucune lettre en attente");
- return;
- }
- if (!$al->invalid()) {
- $page->kill("Une erreur est survenue lors de l'annulation de l'envoi");
- return;
- }
-
- $page->kill("L'envoi de l'annonce {$al->title()} est annulé");
- }
-
- function handler_valid(&$page, $force = null)
+ protected function getNl()
{
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
- if (!AXLetter::hasPerms()) {
- return PL_FORBIDDEN;
- }
-
- $url = parse_url($_SERVER['HTTP_REFERER']);
- if ($force != 'force' && trim($url['path'], '/') != 'ax/edit') {
- return PL_FORBIDDEN;
- }
-
- $al = AXLetter::awaiting();
- if (!$al) {
- $page->kill("Aucune lettre en attente");
- return;
- }
- if (!$al->valid()) {
- $page->kill("Une erreur est survenue lors de la validation de l'envoi");
- return;
- }
-
- $page->kill("L'envoi de l'annonce aura lieu dans l'heure qui vient.");
+ require_once 'newsletter.inc.php';
+ return NewsLetter::forGroup(NewsLetter::GROUP_AX);
}
- function handler_show(&$page, $nid = 'last')
+ function handler_out($page, $hash = null, $issue_id = null)
{
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
- $page->changeTpl('axletter/show.tpl');
-
- $nl = new AXLetter($nid);
- if (Get::has('text')) {
- $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme'));
- } else {
- $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
- }
- if (Post::has('send')) {
- $nl->sendTo(S::v('prenom'), S::v('nom'),
- S::v('bestalias'), S::v('femme'),
- S::v('mail_fmt') != 'texte');
- }
- }
-
- function handler_admin(&$page, $action = null, $uid = null)
- {
- require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
- if (Post::has('action')) {
- $action = Post::v('action');
- $uid = Post::v('uid');
- }
- if ($uid) {
- $uids = preg_split('/ *[,;\: ] */', $uid);
- foreach ($uids as $uid) {
- switch ($action) {
- case 'add':
- $res = AXLetter::grantPerms($uid);
- break;
- case 'del';
- $res = AXLetter::revokePerms($uid);
- break;
- }
- if (!$res) {
- $page->trig("Personne ne oorrespond à l'identifiant '$uid'");
- }
- }
- }
-
- $page->changeTpl('axletter/admin.tpl');
- $res = XDB::iterator("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom,
- u.prenom, u.promo, a.alias AS forlife
- FROM axletter_rights AS ar
- INNER JOIN auth_user_md5 AS u USING(user_id)
- INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type = 'a_vie')");
- $page->assign('admins', $res);
-
- $importer = new CSVImporter('axletter_ins');
- $importer->registerFunction('user_id', 'email vers Id X.org', array($this, 'idFromMail'));
- $importer->forceValue('hash', array($this, 'createHash'));
- $importer->apply($page, "admin/axletter", array('user_id', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash'));
- }
-
- function idFromMail($line, $key)
- {
- static $field;
- global $globals;
- if (!isset($field)) {
- $field = array('email', 'mail', 'login', 'bestalias', 'forlife', 'flag');
- foreach ($field as $fld) {
- if (isset($line[$fld])) {
- $field = $fld;
- break;
- }
- }
- }
- $email = $line[$field];
- if (strpos($email, '@') === false) {
- $user = $email;
- $domain = $globals->mail->domain2;
- } else {
- list($user, $domain) = explode('@', $email);
- }
- if ($domain != $globals->mail->domain && $domain != $globals->mail->domain2
- && $domain != $globals->mail->alias_dom && $domain != $globals->mail->alias_dom2) {
- $res = XDB::query("SELECT uid FROM emails WHERE email = {?}", $email);
- if ($res->numRows() == 1) {
- return $res->fetchOneCell();
+ if (!$hash) {
+ if (!S::logged()) {
+ return PL_DO_AUTH;
}
- return '0';
}
- list($user) = explode('+', $user);
- list($user) = explode('_', $user);
- if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) {
- $res = XDB::query("SELECT a.id
- FROM virtual AS v
- INNER JOIN virtual_redirect AS r USING(vid)
- INNER JOIN aliases AS a ON (a.type = 'a_vie'
- AND r.redirect = CONCAT(a.alias, '@{$globals->mail->domain2}'))
- WHERE v.alias = CONCAT({?}, '@{$globals->mail->alias_dom}')", $user);
- $id = $res->fetchOneCell();
- return $id ? $id : '0';
- }
- $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $user);
- $id = $res->fetchOneCell();
- return $id ? $id : '0';
- }
-
- function createHash($line, $key)
- {
- $hash = implode(time(), $line) . rand();
- $hash = md5($hash);
- return $hash;
+ return $this->handler_nl($page, 'out', $hash, $issue_id);
}
}