Merge commit 'origin/master' into account

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index 300789f..3313bea 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -258,7 +258,7 @@ class ListsModule extends PLModule
             if ($asso == "groupex") {
                 $groupex_name = Post::v('groupex_name');
 
-                $res_groupe = XDB::query('SELECT mail_domain FROM #groupex#.asso WHERE nom={?}', $groupex_name);
+                $res_groupe = XDB::query('SELECT mail_domain FROM groups WHERE nom={?}', $groupex_name);
                 $domain = $res_groupe->fetchOneCell();
 
                 if (!$domain) {
@@ -530,29 +530,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);
@@ -561,7 +547,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) {