X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=31c696530826dee79543d15d5a8e1e5572a06d0a;hb=323e53dc4e0b4d0a65182b179fd27880de0c3ff7;hp=1462fbbe42575399f2add1f353bcc9b3dc928fca;hpb=5cbb1fadfed368d8d7b1b5a711380668f5db3e9b;p=platal.git
diff --git a/modules/lists.php b/modules/lists.php
index 1462fbb..31c6965 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
mail->domain;
}
- function clean_html($res)
- {
- $res = html_entity_decode($res);
- $res = preg_replace('@]*href=["\']([^ >]+)["\'][^>]*>([^<]*)@ie',
- "'\\2 [' . htmlentities('\\1') . ']'", $res);
- $res = preg_replace("@<(/br|p|/div)[^>]*>(\\s*\n)?@i", "\n", $res);
- $res = trim(strip_tags($res));
- $res = preg_replace("/\n(\\s*\n)+/", "\n\n", $res);
- return $res;
- }
-
function handler_lists(&$page)
{
function filter_owner($list)
@@ -81,12 +70,12 @@ class ListsModule extends PLModule
function filter_member($list)
{
- return $list['ins'];
+ return $list['sub'];
}
$this->prepare_client($page);
- $page->changeTpl('listes/index.tpl');
+ $page->changeTpl('lists/index.tpl');
$page->addJsLink('ajax.js');
$page->assign('xorg_title','Polytechnique.org - Listes de diffusion');
@@ -125,8 +114,9 @@ class ListsModule extends PLModule
function handler_ajax(&$page, $list = null)
{
+ header('Content-Type: text/html; charset="iso-8859-15"');
$domain = $this->prepare_client($page);
- $page->changeTpl('listes/liste.inc.tpl', NO_SKIN);
+ $page->changeTpl('lists/liste.inc.tpl', NO_SKIN);
if (Get::has('unsubscribe')) {
$this->client->unsubscribe($list);
}
@@ -152,7 +142,7 @@ class ListsModule extends PLModule
function handler_create(&$page)
{
- $page->changeTpl('listes/create.tpl');
+ $page->changeTpl('lists/create.tpl');
$owners = preg_split("/[\s]+/", Post::v('owners'), -1, PREG_SPLIT_NO_EMPTY);
$members = preg_split("/[\s]+/", Post::v('members'), -1, PREG_SPLIT_NO_EMPTY);
@@ -242,7 +232,7 @@ class ListsModule extends PLModule
$this->prepare_client($page);
- $page->changeTpl('listes/members.tpl');
+ $page->changeTpl('lists/members.tpl');
if (Get::has('del')) {
$this->client->unsubscribe($liste);
@@ -301,7 +291,7 @@ class ListsModule extends PLModule
$this->prepare_client($page);
- $page->changeTpl('listes/trombi.tpl');
+ $page->changeTpl('lists/trombi.tpl');
if (Get::has('del')) {
$this->client->unsubscribe($liste);
@@ -327,7 +317,7 @@ class ListsModule extends PLModule
}
}
- function handler_archives(&$page, $liste = null)
+ function handler_archives(&$page, $liste = null, $action = null, $artid = null)
{
global $globals;
@@ -337,35 +327,41 @@ class ListsModule extends PLModule
$domain = $this->prepare_client($page);
- $page->changeTpl('listes/archives.tpl');
+ $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;
+ }
+ $get = Array('listname' => $liste, 'domain' => $domain);
+ if (Post::has('updateall')) {
+ $get['updateall'] = Post::v('updateall');
+ }
+ if (!is_null($action)) {
+ if ($action == 'new') {
+ $get['action'] = 'new';
+ } elseif (!is_null($artid)) {
+ $get['artid'] = $artid;
+ if ($action == 'reply') {
+ $get['action'] = 'new';
+ } elseif ($action == 'cancel') {
+ $get['action'] = $action;
+ } elseif ($action == 'from') {
+ $get['first'] = $artid;
+ } elseif ($action == 'read') {
+ $get['part'] = @$_GET['part'];
+ } elseif ($action == 'source') {
+ $get['part'] = 'source';
+ } elseif ($action == 'xface') {
+ $get['part'] = 'xface';
}
}
- $page->assign('archs', $archs);
- $page->assign('range', range(1,12));
}
+ require_once('banana/ml.inc.php');
+ $banana = new MLBanana($get);
+ $page->assign('banana', $banana->run());
+ $page->addCssLink('banana.css');
} else {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter");
}
@@ -403,8 +399,7 @@ class ListsModule extends PLModule
." Sujet : « {$mail['subj']} »\n"
." Date : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n"
.$append;
- require_once 'diogenes/diogenes.hermes.inc.php';
- $mailer = new HermesMailer();
+ $mailer = new PlMailer();
$mailer->addTo("$liste-owner@{$domain}");
$mailer->setFrom("$liste-bounces@{$domain}");
$mailer->addHeader('Reply-To', "$liste-owner@{$domain}");
@@ -425,43 +420,49 @@ class ListsModule extends PLModule
$domain = $this->prepare_client($page);
- $page->changeTpl('listes/moderate.tpl');
+ $page->changeTpl('lists/moderate.tpl');
- $page->register_modifier('qpd', 'quoted_printable_decode');
$page->register_modifier('hdc', 'list_header_decode');
- $page->register_modifier('clean_html', array($this, 'clean_html'));
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('mid')) {
- $mail = $this->moderate_mail($domain, $liste, Env::i('mid'));
+ if (Post::has('moderate_mails') && Post::has('select_mails')) {
+ $mails = array_keys(Post::v('select_mails'));
+ foreach($mails as $mail) {
+ $this->moderate_mail($domain, $liste, $mail);
+ }
+ } elseif (Env::has('mid')) {
+ if (Get::has('mid')) {
+ 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();
- if (Get::has('mid') && is_array($mail)) {
$msg = file_get_contents('/etc/mailman/fr/refuse.txt');
$msg = str_replace("%(adminaddr)s", "$liste-owner@{$domain}", $msg);
$msg = str_replace("%(request)s", "<< SUJET DU MAIL >>", $msg);
$msg = str_replace("%(reason)s", "<< TON EXPLICATION >>", $msg);
$msg = str_replace("%(listname)s", $liste, $msg);
-
$page->assign('msg', $msg);
-
- $page->changeTpl('listes/moderate_mail.tpl');
- $page->assign_by_ref('mail', $mail);
+
+ $page->addCssLink('banana.css');
+ $page->changeTpl('lists/moderate_mail.tpl');
+ $page->assign_by_ref('mail', $res);
return;
- }
- } elseif (Env::has('sid')) {
+ }
+ $mail = $this->moderate_mail($domain, $liste, Env::i('mid'));
+ } elseif (Env::has('sid')) {
if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
foreach($subs as $user) {
if ($user['id'] == Env::v('sid')) {
- $page->changeTpl('listes/moderate_sub.tpl');
+ $page->changeTpl('lists/moderate_sub.tpl');
$page->assign('del_user', $user);
return;
}
@@ -471,6 +472,9 @@ class ListsModule extends PLModule
}
if (list($subs,$mails) = $this->client->get_pending_ops($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 {
@@ -488,7 +492,7 @@ class ListsModule extends PLModule
$this->prepare_client($page);
- $page->changeTpl('listes/admin.tpl');
+ $page->changeTpl('lists/admin.tpl');
if (Env::has('add_member')) {
require_once('user.func.inc.php');
@@ -533,8 +537,8 @@ class ListsModule extends PLModule
}
if (list($det,$mem,$own) = $this->client->get_members($liste)) {
- $membres = list_sort_members($mem, $tri_promo);
- $moderos = list_sort_owners($own, $tri_promo);
+ $membres = list_sort_members($mem, @$tri_promo);
+ $moderos = list_sort_owners($own, @$tri_promo);
$page->assign_by_ref('details', $det);
$page->assign_by_ref('members', $membres);
@@ -542,7 +546,9 @@ class ListsModule extends PLModule
$page->assign('np_m', count($mem));
} else {
- $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer");
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.
"
+ ." Si tu penses qu'il s'agit d'une erreur, "
+ ."contact le support");
}
}
@@ -554,7 +560,7 @@ class ListsModule extends PLModule
$this->prepare_client($page);
- $page->changeTpl('listes/options.tpl');
+ $page->changeTpl('lists/options.tpl');
if (Post::has('submit')) {
$values = $_POST;
@@ -599,23 +605,36 @@ class ListsModule extends PLModule
function handler_delete(&$page, $liste = null)
{
+ global $globals;
if (is_null($liste)) {
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
-
- $page->changeTpl('listes/delete.tpl');
-
- if (Post::v('valid') == 'OUI'
- && $this->client->delete_list($liste, Post::b('del_archive')))
- {
- foreach (array('', '-owner', '-admin', '-bounces') as $app) {
- XDB::execute("DELETE FROM aliases
- WHERE type='liste' AND alias='{?}'",
- $liste.$app);
+ $domain = $this->prepare_client($page);
+ if ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) {
+ $domain = '';
+ $table = 'aliases';
+ $type = 'liste';
+ } else {
+ $domain = '@' . $domain;
+ $table = 'virtual';
+ $type = 'list';
+ }
+
+ $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) {
+ XDB::execute("DELETE FROM $table
+ WHERE type={?} AND alias={?}",
+ $type, $liste.$app.$domain);
+ }
+ $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 : '
+ . 'support@polytechnique.org');
}
- $page->assign('deleted', true);
} elseif (list($details,$options) = $this->client->get_owner_options($liste)) {
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
@@ -633,7 +652,7 @@ class ListsModule extends PLModule
$this->prepare_client($page);
- $page->changeTpl('listes/soptions.tpl');
+ $page->changeTpl('lists/soptions.tpl');
if (Post::has('submit')) {
$values = $_POST;
@@ -659,7 +678,7 @@ class ListsModule extends PLModule
$this->prepare_client($page);
- $page->changeTpl('listes/check.tpl');
+ $page->changeTpl('lists/check.tpl');
if (Post::has('correct')) {
$this->client->check_options($liste, true);
@@ -674,7 +693,7 @@ class ListsModule extends PLModule
}
function handler_admin_all(&$page) {
- $page->changeTpl('listes/admin_all.tpl');
+ $page->changeTpl('lists/admin_all.tpl');
$page->assign('xorg_title','Polytechnique.org - Administration - Mailing lists');
$client = new MMList(S::v('uid'), S::v('password'));