From f04660bfe4add5cf47297d81d304274d3ef4d42e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Thu, 8 Nov 2012 00:15:46 +0100
Subject: [PATCH] Add MailingList::subscribeTo shortcut.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

And MailingList::subscribePromo.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 include/mailinglist.inc.php           | 12 ++++++++++++
 include/reminder/ml.inc.php           |  3 +--
 include/reminder/promotion_ml.inc.php |  3 +--
 modules/register.php                  |  3 +--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/include/mailinglist.inc.php b/include/mailinglist.inc.php
index bf88941..c8ceca2 100644
--- a/include/mailinglist.inc.php
+++ b/include/mailinglist.inc.php
@@ -77,6 +77,18 @@ class MailingList
         return $this->mmclient->subscribe($this->mbox);
     }
 
+    public static function subscribeTo($mbox, $domain, $user=null)
+    {
+        $mlist = new MailingList($mbox, $domain, $user);
+        return $mlist->subscribe();
+    }
+
+    public static function subscribePromo($promo, $user=null)
+    {
+        $mlist = MailingList::promo($promo, $user);
+        return $mlist->subscribe();
+    }
+
     /** Subscribe a batch of users to the list
      */
     public function subscribeBulk($members)
diff --git a/include/reminder/ml.inc.php b/include/reminder/ml.inc.php
index 808fc3e..0eb475a 100644
--- a/include/reminder/ml.inc.php
+++ b/include/reminder/ml.inc.php
@@ -35,8 +35,7 @@ class ReminderMl extends Reminder
                                 S::i('uid'));
             while (list($sub, $domain) = $res->next()) {
                 if (array_shift($subs) == "$sub@$domain") {
-                    $mlist = new MailingList($sub, $domain);
-                    $mlist->subscribe();
+                    MailingList::subscribeTo($sub, $domain);
                 }
             }
 
diff --git a/include/reminder/promotion_ml.inc.php b/include/reminder/promotion_ml.inc.php
index ab8da38..710ac4f 100644
--- a/include/reminder/promotion_ml.inc.php
+++ b/include/reminder/promotion_ml.inc.php
@@ -31,8 +31,7 @@ class ReminderPromotionMl extends Reminder
                                         FROM  groups
                                        WHERE  diminutif = {?}',
                          $user->id(), $user->profile()->yearPromo());
-            $mlist = MailingList::promo($user->profile()->yearPromo());
-            $mlist->subscribe():
+            MailingList::subscribePromo($user->profile()->yearPromo());
 
             $this->UpdateOnYes();
             break;
diff --git a/modules/register.php b/modules/register.php
index 70480c7..79196c4 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -426,8 +426,7 @@ class RegisterModule extends PLModule
                                                       VALUES  ({?}, {?})',
                                          $uid, $asso_id);
                             try {
-                                $mlist = MailingList::promo($yearpromo, $user);
-                                $mlist->subscribe();
+                                MailingList::subscribePromo($yearpromo, $user);
                             } catch (Exception $e) {
                                 PlErrorReport::report($e);
                                 $page->trigError("L'inscription à la liste promo" . $yearpromo . " a échouée.");
-- 
2.1.4