From 7a708a96543735332b92c32e4fbd7db4f9840568 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Thu, 8 Nov 2012 00:10:14 +0100
Subject: [PATCH] Convert cron_ml_moderate to MailingList.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 bin/cron/cron_ml_moderate.php | 30 ++++++++++++++----------------
 include/mailinglist.inc.php   |  9 +++++++++
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/bin/cron/cron_ml_moderate.php b/bin/cron/cron_ml_moderate.php
index e77643d..3720907 100755
--- a/bin/cron/cron_ml_moderate.php
+++ b/bin/cron/cron_ml_moderate.php
@@ -42,37 +42,35 @@ while ($sent_mails < $globals->lists->max_mail_per_min
     if (XDB::affectedRows() == 0) {
         break;
     }
-    $query = XDB::query('SELECT  a.full_name, a.uid, a.password,
-                                 ml.ml, ml.domain, ml.mid, ml.action, ml.message
-                           FROM  accounts            AS a
-                     INNER JOIN  email_list_moderate AS ml ON (a.uid = ml.uid)
-                          WHERE  ml.handler = {?}', $handler);
-    list($fullname, $uid, $password, $list, $domain, $mid, $action, $reason) = $query->fetchOneRow();
-
-    // build the client
-    $client = new MMList($uid, $password, $domain);
+    $query = XDB::query('SELECT  uid, ml, domain, mid, action, message
+                           FROM  email_list_moderate
+                          WHERE  handler = {?}', $handler);
+    list($uid, $list, $domain, $mid, $action, $reason) = $query->fetchOneRow();
+    $user = User::get($uid);
+    $fullname = $user->fullName();
+    $mlist = new MailingList($list, $domain, $user);
 
     // send the mail
-    $mail = $client->get_pending_mail($list, $mid);
-    list($det,$mem,$own) = $client->get_members($list);
+    $mail = $mlist->getPendingMail($mid);
+    list($det,$mem,$own) = $mlist->getMembers();
     $count = 0;
     switch ($action) {
       case 'accept':
-        $action = 1;    /** 1 = ACCEPT **/
+        $action = MailingList::REQ_ACCEPT;
         $subject = "Message accepté";
         $append  = "a été accepté par $fullname.\n";
         $type = 'nonspam';
         $count += count($mem) + count($own);
         break;
       case 'refuse':
-        $action = 2;    /** 2 = REJECT **/
+        $action = MailingList::REQ_REJECT;
         $subject = "Message refusé";
         $append  = "a été refusé par $fullname avec la raison :\n\n" . $reason;
         $type = 'nonspam';
         $count += count($own) + 1;
         break;
       case 'delete':
-        $action = 3;    /** 3 = DISCARD **/
+        $action = MailingList::REQ_DISCARD;
         $subject = "Message supprimé";
         $append  = "a été supprimé par $fullname.\n\n"
                  . "Rappel : il ne faut utiliser cette opération "
@@ -83,7 +81,7 @@ while ($sent_mails < $globals->lists->max_mail_per_min
     }
 
     // if the mail was classified as Unsure, feed bogo
-    $raw_mail = html_entity_decode($client->get_pending_mail($list, $mid, 1));
+    $raw_mail = html_entity_decode($mlist->getPendingMail($mid, 1));
     // search for the X-Spam-Flag header
     $end_of_headers = strpos($raw_mail, "\r\n\r\n");
     if ($end_of_headers === false) {   // sometimes headers are separated by \n
@@ -103,7 +101,7 @@ while ($sent_mails < $globals->lists->max_mail_per_min
     }
 
     // send feedback to the mailing list owners
-    if ($client->handle_request($list, $mid, $action, utf8_decode($reason))) {
+    if ($mlist->handleRequest($action, $mid, $reason)) {
         $sent_mails += $count;
         $texte = "Le message suivant :\n\n"
                . "    Auteur: {$mail['sender']}\n"
diff --git a/include/mailinglist.inc.php b/include/mailinglist.inc.php
index 84cb526..c1bd630 100644
--- a/include/mailinglist.inc.php
+++ b/include/mailinglist.inc.php
@@ -148,7 +148,9 @@ class MailingList
         return $this->mmclient->get_pending_ops($this->mbox);
     }
 
+    const REQ_ACCEPT = 1;
     const REQ_REJECT = 2;
+    const REQ_DISCARD = 3;
     const REQ_SUBSCRIBE = 4;
 
     /** Handle a mailing list request
@@ -166,6 +168,13 @@ class MailingList
         return $this->mmclient->get_pending_sub($this->mbox, $email);
     }
 
+    /** Retrieve pending mails
+     */
+    public function getPendingMail($mid)
+    {
+        return $this->mmclient->get_pending_mail($this->mbox, $mid);
+    }
+
     /** Create a list
      */
     public function create($description, $advertise,
-- 
2.1.4