X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=a1629c03ae6146ce59db7883a28b5f0226e9e01a;hb=45e9910e4f0213fd1f6266eee0be725ffbc1fb38;hp=efd529d064530a679ab9e357f8fc956889ecb934;hpb=ed03d07f3821b8b22a0da434436d22cb7a53f2e3;p=platal.git
diff --git a/modules/lists.php b/modules/lists.php
index efd529d..a1629c0 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
$this->make_hook('lists', AUTH_MDP),
- 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, '', NO_AUTH),
+ 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH),
'lists/create' => $this->make_hook('create', AUTH_MDP),
'lists/members' => $this->make_hook('members', AUTH_COOKIE),
- 'lists/trombi' => $this->make_hook('trombi', 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/admin' => $this->make_hook('admin', AUTH_MDP),
@@ -41,7 +42,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'),
);
}
@@ -61,6 +62,22 @@ class ListsModule extends PLModule
return $globals->mail->domain;
}
+ function get_pending_ops($domain, $list)
+ {
+ list($subs,$mails) = $this->client->get_pending_ops($list);
+ $res = XDB::query("SELECT mid
+ FROM ml_moderate
+ WHERE ml = {?} AND domain = {?}",
+ $list, $domain);
+ $mids = $res->fetchColumn();
+ foreach ($mails as $key=>$mail) {
+ if (in_array($mail['id'], $mids)) {
+ unset($mails[$key]);
+ }
+ }
+ return array($subs, $mails);
+ }
+
function handler_lists(&$page)
{
function filter_owner($list)
@@ -73,7 +90,7 @@ class ListsModule extends PLModule
return $list['sub'];
}
- $this->prepare_client($page);
+ $domain = $this->prepare_client($page);
$page->changeTpl('lists/index.tpl');
$page->addJsLink('ajax.js');
@@ -102,7 +119,7 @@ class ListsModule extends PLModule
$member = array_filter($listes, 'filter_member');
$listes = array_diff_key($listes, $member);
foreach ($owner as $key=>$liste) {
- list($subs,$mails) = $this->client->get_pending_ops($liste['list']);
+ list($subs,$mails) = $this->get_pending_ops($domain, $liste['list']);
$owner[$key]['subscriptions'] = $subs;
$owner[$key]['mails'] = $mails;
}
@@ -114,7 +131,7 @@ class ListsModule extends PLModule
function handler_ajax(&$page, $list = null)
{
- header('Content-Type: text/html; charset="iso-8859-15"');
+ header('Content-Type: text/html; charset="UTF-8"');
$domain = $this->prepare_client($page);
$page->changeTpl('lists/liste.inc.tpl', NO_SKIN);
if (Get::has('unsubscribe')) {
@@ -132,7 +149,7 @@ class ListsModule extends PLModule
list($liste, $members, $owners) = $this->client->get_members($list);
if ($liste['own']) {
- list($subs,$mails) = $this->client->get_pending_ops($list);
+ list($subs,$mails) = $this->get_pending_ops($domain, $list);
$liste['subscriptions'] = $subs;
$liste['mails'] = $mails;
}
@@ -188,20 +205,20 @@ class ListsModule extends PLModule
$liste = Post::v('liste');
if (empty($liste)) {
- $page->trig('champs «addresse souhaitée» vide');
+ $page->trig('champs «addresse souhaitée» vide');
}
if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) {
- $page->trig('le nom de la liste ne doit contenir que des lettres, chiffres et tirets');
+ $page->trig('le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets');
}
$res = XDB::query("SELECT COUNT(*) FROM aliases WHERE alias={?}", $liste);
$n = $res->fetchOneCell();
if ($n) {
- $page->trig('cet alias est déjà pris');
+ $page->trig('cet alias est déjà pris');
}
- if (!Post::v(desc)) {
+ if (!Post::v('desc')) {
$page->trig('le sujet est vide');
}
@@ -257,33 +274,11 @@ class ListsModule extends PLModule
$page->assign_by_ref('owners', $moderos);
$page->assign('nb_m', count($mem));
} else {
- $page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails");
- }
- }
-
- function _get_list($offset, $limit)
- {
- global $platal;
- list($total, $members) = $this->client->get_members_limit($platal->argv[1], $offset, $limit);
-
- $membres = Array();
- foreach ($members as $member) {
- list($m) = explode('@',$member[1]);
- $res = XDB::query("SELECT prenom,if (nom_usage='', nom, nom_usage) AS nom,
- promo, a.alias AS forlife
- FROM auth_user_md5 AS u
- INNER JOIN aliases AS a ON u.user_id = a.id
- WHERE a.alias = {?}", $m);
- if ($tmp = $res->fetchOneAssoc()) {
- $membres[$tmp['nom']] = $tmp;
- } else {
- $membres[$member[0]] = array('addr' => $member[0]);
- }
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails");
}
- return array($total, $membres);
}
- function handler_trombi(&$page, $liste = null)
+ function handler_annu(&$page, $liste = null, $action = null, $subaction = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
@@ -291,33 +286,45 @@ class ListsModule extends PLModule
$this->prepare_client($page);
- $page->changeTpl('lists/trombi.tpl');
-
if (Get::has('del')) {
$this->client->unsubscribe($liste);
- pl_redirect('lists/tromi/'.$liste);
+ pl_redirect('lists/annu/'.$liste);
}
if (Get::has('add')) {
$this->client->subscribe($liste);
- pl_redirect('lists/tromi/'.$liste);
+ pl_redirect('lists/annu/'.$liste);
}
$owners = $this->client->get_owners($liste);
+ if (!is_array($owners)) {
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails");
+ }
- if (is_array($owners)) {
- $moderos = list_sort_owners($owners[1]);
-
- $page->assign_by_ref('details', $owners[0]);
- $page->assign_by_ref('owners', $moderos);
-
- $trombi = new Trombi(array(&$this, '_get_list'));
- $page->assign('trombi', $trombi);
- } else {
- $page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails");
+ global $platal;
+ list(,$members) = $this->client->get_members($liste);
+ $users = array();
+ foreach ($members as $m) {
+ $users[] = $m[1];
+ }
+ require_once 'userset.inc.php';
+ $view = new ArraySet($users);
+ $view->addMod('trombi', 'Trombinoscope', true, array('with_promo' => true));
+ if (empty($GLOBALS['IS_XNET_SITE'])) {
+ $view->addMod('minifiche', 'Minifiches', false);
+ }
+ $view->addMod('geoloc', 'Planisphère');
+ $view->apply("lists/annu/$liste", $page, $action, $subaction);
+ if ($action == 'geoloc' && $subaction) {
+ return;
}
+
+ $page->changeTpl('lists/annu.tpl');
+ $moderos = list_sort_owners($owners[1]);
+ $page->assign_by_ref('details', $owners[0]);
+ $page->assign_by_ref('owners', $moderos);
}
- function handler_archives(&$page, $liste = null)
+ function handler_archives(&$page, $liste = null, $action = null, $artid = null)
{
global $globals;
@@ -329,87 +336,72 @@ class ListsModule extends PLModule
$page->changeTpl('lists/archives.tpl');
- $page->addCssLink('lists.archives.css');
if (list($det) = $this->client->get_members($liste)) {
if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
- && !$det['own'] && ($det['sub'] < 2))
- {
+ && !$det['own'] && ($det['sub'] < 2)) {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter");
- } elseif (Get::has('file')) {
- $file = Get::v('file');
- $rep = Get::v('rep');
- if (strstr('/', $file)!==false || !preg_match(',^\d+/\d+$,', $rep)) {
- $page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter");
- } else {
- $page->assign('archives', $globals->lists->spool
- ."/{$domain}{$globals->lists->vhost_sep}$liste/$rep/$file");
- }
- } else {
- $archs = Array();
- foreach (glob($globals->lists->spool
- ."/{$domain}{$globals->lists->vhost_sep}$liste/*/*") as $rep)
- {
- if (preg_match(",/(\d*)/(\d*)$,", $rep, $matches)) {
- $archs[intval($matches[1])][intval($matches[2])] = true;
- }
- }
- $page->assign('archs', $archs);
- $page->assign('range', range(1,12));
}
+ $get = Array('listname' => $liste, 'domain' => $domain);
+ if (Post::has('updateall')) {
+ $get['updateall'] = Post::v('updateall');
+ }
+ require_once 'banana/ml.inc.php';
+ get_banana_params($get, null, $action, $artid);
+ run_banana($page, 'MLBanana', $get);
} else {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter");
}
}
- function moderate_mail($domain, $liste, $mid)
+ function handler_rss(&$page, $liste = null, $alias = null, $hash = null)
{
- $mail = $this->client->get_pending_mail($liste, $mid);
- $reason = '';
+ require_once('rss.inc.php');
+ $uid = init_rss(null, $alias, $hash);
+ if (!$uid || !$liste) {
+ exit;
+ }
- $prenom = S::v('prenom');
- $nom = S::v('nom');
+ $res = XDB::query("SELECT user_id AS uid, password, alias AS forlife
+ FROM auth_user_md5 AS u
+ INNER JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie')
+ WHERE u.user_id = {?}", $uid);
+ $row = $res->fetchOneAssoc();
+ $_SESSION = array_merge($row, $_SESSION);
+ $domain = $this->prepare_client($page);
+ if (list($det) = $this->client->get_members($liste)) {
+ if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
+ && !$det['own'] && ($det['sub'] < 2)) {
+ exit;
+ }
+ require_once('banana/ml.inc.php');
+ $banana = new MLBanana(S::v('forlife'), Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2'));
+ $banana->run();
+ }
+ exit;
+ }
+
+ function moderate_mail($domain, $liste, $mid)
+ {
if (Env::has('mok')) {
- $action = 1; /** 2 = ACCEPT **/
- $subject = "Message accepté";
- $append .= "a été accepté par $prenom $nom.\n";
+ $action = 'accept';
} elseif (Env::has('mno')) {
- $action = 2; /** 2 = REJECT **/
- $subject = "Message refusé";
- $reason = Post::v('reason');
- $append = "a été refusé par $prenom $nom avec la raison :\n\n"
- . $reason;
+ $action = 'refuse';
} elseif (Env::has('mdel')) {
- $action = 3; /** 3 = DISCARD **/
- $subject = "Message supprimé";
- $append = "a été supprimé par $prenom $nom.\n\n"
- . "Rappel: il ne faut utiliser cette opération "
- . "que dans le cas de spams ou de virus !\n";
- }
-
- if (isset($action) && $this->client->handle_request($liste, $mid, $action, $reason)) {
- $texte = "le message suivant :\n\n"
- ." Auteur: {$mail['sender']}\n"
- ." Sujet : « {$mail['subj']} »\n"
- ." Date : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n"
- .$append;
- $mailer = new PlMailer();
- $mailer->addTo("$liste-owner@{$domain}");
- $mailer->setFrom("$liste-bounces@{$domain}");
- $mailer->addHeader('Reply-To', "$liste-owner@{$domain}");
- $mailer->setSubject($subject);
- $mailer->setTxtBody(wordwrap($texte,72));
- $mailer->send();
- Get::kill('mid');
- }
-
- return $mail;
+ $action = 'delete';
+ } else {
+ return false;
+ }
+ Get::kill('mid');
+ return XDB::execute("INSERT IGNORE INTO ml_moderate
+ VALUES ({?}, {?}, {?}, {?}, {?}, NOW(), {?}, NULL)",
+ $liste, $domain, $mid, S::i('uid'), $action, Post::v('reason'));
}
function handler_moderate(&$page, $liste = null)
{
if (is_null($liste)) {
- return PL_NOT_FOUND;
+ return PL_NOT_FOUND;
}
$domain = $this->prepare_client($page);
@@ -418,12 +410,34 @@ class ListsModule extends PLModule
$page->register_modifier('hdc', 'list_header_decode');
- if (Env::has('sadd')) { /* 4 = SUBSCRIBE */
- $this->client->handle_request($liste,Env::v('sadd'),4,'');
- pl_redirect('lists/moderate/'.$liste);
- }
- if (Post::has('sdel')) { /* 2 = REJECT */
- $this->client->handle_request($liste,Post::v('sdel'),2,Post::v('reason'));
+ if (Env::has('sadd') || Env::has('sdel')) {
+ if (Env::has('sadd')) { /* 4 = SUBSCRIBE */
+ $sub = $this->client->get_pending_sub($liste, Env::v('sadd'));
+ $this->client->handle_request($liste,Env::v('sadd'),4,'');
+ $info = "validée";
+ }
+ if (Post::has('sdel')) { /* 2 = REJECT */
+ $sub = $this->client->get_pending_sub($liste, Env::v('sdel'));
+ $this->client->handle_request($liste, Post::v('sdel'), 2, Post::v('reason'));
+ $info = "refusée";
+ }
+ if ($sub) {
+ $mailer = new PlMailer();
+ $mailer->setFrom("$liste-bounces@{$domain}");
+ $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";
+ if (trim(Post::v('reason'))) {
+ $text .= "\nLa raison invoquée est :\n" . Post::v('reason');
+ }
+ $mailer->setTxtBody(wordwrap($text, 72));
+ $mailer->send();
+ }
+ if (Env::has('sadd')) {
+ pl_redirect('lists/moderate/'.$liste);
+ }
}
if (Post::has('moderate_mails') && Post::has('select_mails')) {
@@ -432,11 +446,13 @@ class ListsModule extends PLModule
$this->moderate_mail($domain, $liste, $mail);
}
} elseif (Env::has('mid')) {
- if (Get::has('mid')) {
+ if (Get::has('mid') && !Env::has('mok') && !Env::has('mdel')) {
+ $page->changeTpl('lists/moderate_mail.tpl');
require_once('banana/moderate.inc.php');
- $params = array('listname' => $liste, 'domain' => $domain, 'artid' => Get::i('mid'), 'part' => Get::v('part'));
- $banana = new ModerationBanana($params, $this->client);
- $res = $banana->run();
+ $params = array('listname' => $liste, 'domain' => $domain,
+ 'artid' => Get::i('mid'), 'part' => Get::v('part'), 'action' => Get::v('action'));
+ $params['client'] = $this->client;
+ run_banana($page, 'ModerationBanana', $params);
$msg = file_get_contents('/etc/mailman/fr/refuse.txt');
$msg = str_replace("%(adminaddr)s", "$liste-owner@{$domain}", $msg);
@@ -444,16 +460,12 @@ class ListsModule extends PLModule
$msg = str_replace("%(reason)s", "<< TON EXPLICATION >>", $msg);
$msg = str_replace("%(listname)s", $liste, $msg);
$page->assign('msg', $msg);
-
- $page->addCssLink('banana.css');
- $page->changeTpl('lists/moderate_mail.tpl');
- $page->assign_by_ref('mail', $res);
return;
}
$mail = $this->moderate_mail($domain, $liste, Env::i('mid'));
} elseif (Env::has('sid')) {
- if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
+ if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
foreach($subs as $user) {
if ($user['id'] == Env::v('sid')) {
$page->changeTpl('lists/moderate_sub.tpl');
@@ -465,14 +477,30 @@ class ListsModule extends PLModule
}
- if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
+ if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
foreach ($mails as $key=>$mail) {
$mails[$key]['stamp'] = strftime("%Y%m%d%H%M%S", $mail['stamp']);
}
$page->assign_by_ref('subs', $subs);
$page->assign_by_ref('mails', $mails);
} else {
- $page->kill("La liste n'existe pas ou tu n'as pas le droit de la modérer");
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit de la modérer");
+ }
+ }
+
+ static public function no_login_callback($login)
+ {
+ require_once 'user.func.inc.php';
+ global $list_unregistered;
+
+ $users = get_not_registered_user($login, true);
+ if ($users && $users->total()) {
+ if (!isset($list_unregistered)) {
+ $list_unregistered = array();
+ }
+ $list_unregistered[$login] = $users;
+ } else {
+ _default_user_callback($login);
}
}
@@ -484,13 +512,43 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $domain = $this->prepare_client($page);
$page->changeTpl('lists/admin.tpl');
+ if (Env::has('send_mark')) {
+ $actions = Env::v('mk_action');
+ $uids = Env::v('mk_uid');
+ $mails = Env::v('mk_email');
+ foreach ($actions as $key=>$action) {
+ switch ($action) {
+ case 'none':
+ break;
+
+ case 'marketu': case 'markets':
+ require_once 'emails.inc.php';
+ $mail = valide_email($mails[$key]);
+ if (isvalid_email_redirection($mail)) {
+ $from = ($action == 'marketu') ? 'user' : 'staff';
+ $market = Marketing::get($uids[$key], $mail);
+ if (!$market) {
+ $market = new Marketing($uids[$key], $mail, 'list', "$liste@$domain", $from, S::v('uid'));
+ $market->add();
+ break;
+ }
+ }
+
+ default:
+ XDB::execute('INSERT IGNORE INTO register_subs (uid, type, sub, domain)
+ VALUES ({?}, \'list\', {?}, {?})',
+ $uids[$key], $liste, $domain);
+ }
+ }
+ }
+
if (Env::has('add_member')) {
require_once('user.func.inc.php');
- $members = get_users_forlife_list(Env::v('add_member'));
+ $members = get_users_forlife_list(Env::v('add_member'), false, array('ListsModule', 'no_login_callback'));
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {
@@ -511,11 +569,11 @@ class ListsModule extends PLModule
if (Env::has('add_owner')) {
require_once('user.func.inc.php');
- $owners = get_users_forlife_list(Env::v('add_owner'));
+ $owners = get_users_forlife_list(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
if ($owners) {
foreach ($owners as $login) {
if ($this->client->add_owner($liste, $login)) {
- $page->trig($alias." ajouté aux modérateurs.");
+ $page->trig($alias." ajouté aux modérateurs.");
}
}
}
@@ -531,6 +589,10 @@ class ListsModule extends PLModule
}
if (list($det,$mem,$own) = $this->client->get_members($liste)) {
+ global $list_unregistered;
+ if ($list_unregistered) {
+ $page->assign_by_ref('unregistered', $list_unregistered);
+ }
$membres = list_sort_members($mem, @$tri_promo);
$moderos = list_sort_owners($own, @$tri_promo);
@@ -558,6 +620,7 @@ class ListsModule extends PLModule
if (Post::has('submit')) {
$values = $_POST;
+ $values = array_map('utf8_decode', $values);
$this->client->set_bogo_level($liste, intval($values['bogo_level']));
switch($values['moderate']) {
case '0':
@@ -618,7 +681,7 @@ class ListsModule extends PLModule
$page->changeTpl('lists/delete.tpl');
if (Post::v('valid') == 'OUI') {
if ($this->client->delete_list($liste, Post::b('del_archive'))) {
- foreach (array('', '-owner', '-admin', '-bounces') as $app) {
+ foreach (array('', '-owner', '-admin', '-bounces', '-unsubscribe') as $app) {
XDB::execute("DELETE FROM $table
WHERE type={?} AND alias={?}",
$type, $liste.$app.$domain);
@@ -626,7 +689,7 @@ class ListsModule extends PLModule
$page->assign('deleted', true);
} else {
$page->kill('Une erreur est survenue lors de la suppression de la liste.
'
- . 'Contact les administrateurs du site pour régler le problème : '
+ . 'Contact les administrateurs du site pour régler le problème : '
. 'support@polytechnique.org');
}
} elseif (list($details,$options) = $this->client->get_owner_options($liste)) {
@@ -650,6 +713,7 @@ class ListsModule extends PLModule
if (Post::has('submit')) {
$values = $_POST;
+ $values = array_map('utf8_decode', $values);
unset($values['submit']);
$values['advertised'] = empty($values['advertised']) ? false : true;
$values['archive'] = empty($values['archive']) ? false : true;
@@ -696,4 +760,5 @@ class ListsModule extends PLModule
}
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>