From ecc72a6ddcc79a52a2783fed82eb6e09da1535b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 30 Nov 2009 23:41:26 +0100 Subject: [PATCH] Removes incorrect implementation of 'Notifies the sender when a moderated message to a ML is accepted'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- modules/lists.php | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/modules/lists.php b/modules/lists.php index 02e119e..bb467b1 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -531,29 +531,15 @@ class ListsModule extends PLModule } } elseif (Env::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'), 'action' => Get::v('action')); - $params['client'] = $this->client; - run_banana($page, 'ModerationBanana', $params); + require_once 'banana/moderate.inc.php'; - $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); - return; - } elseif (Get::has('mid') && Env::has('mok')) { $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'), 'action' => Get::v('action')); $params['client'] = $this->client; run_banana($page, 'ModerationBanana', $params); - $msg = file_get_contents('/etc/mailman/fr/accept.txt'); + $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); @@ -562,7 +548,7 @@ class ListsModule extends PLModule return; } - $mail = $this->moderate_mail($domain, $liste, Env::i('mid')); + $this->moderate_mail($domain, $liste, Env::i('mid')); } elseif (Env::has('sid')) { if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) { foreach($subs as $user) { -- 2.1.4