Removes incorrect implementation of 'Notifies the sender when a moderated message...

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/lists.php b/modules/lists.php
index 02e119e..bb467b1 100644 (file)
--- 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')) {
             }
         } 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');
                 $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);
 
                 $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);
                 $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;
             }
 
                 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) {
         } elseif (Env::has('sid')) {
             if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
                 foreach($subs as $user) {