Moving to GitHub.

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index d4e3d81..1683913 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2011 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -560,14 +560,14 @@ class ListsModule extends PLModule
 
             if (Env::has('sadd')) {
                 // Ensure the moderated request is still active
-                $sub = $mlist->getPendingSub(Env::v('sadd'));
+                $sub = $mlist->getPendingSubscription(Env::v('sadd'));
 
                 $mlist->handleRequest(MailingList::REQ_SUBSCRIBE, Env::v('sadd'));
                 $info = "validée";
             }
             if (Post::has('sdel')) {
                 // Ensure the moderated request is still active
-                $sub = $mlist->getPendingSub(Env::v('sdel'));
+                $sub = $mlist->getPendingSubscription(Env::v('sdel'));
 
                 $mlist->handleRequest(MailingList::REQ_REJECT, Post::v('sdel'), Post::v('reason'));
                 $info = "refusée";
@@ -799,7 +799,7 @@ class ListsModule extends PLModule
 
             if (strpos(Env::v('del_owner'), '@') === false) {
                 if ($del_owner = User::getSilent(Env::t('del_owner'))) {
-                    $mlist->unsubscribeBulk(array($del_owner->forlifeEmail()));
+                    $mlist->removeOwner($del_owner->forlifeEmail());
                 }
             } else {
                 $mlist->removeOwner(Env::v('del_owner'));
@@ -1060,5 +1060,5 @@ class ListsModule extends PLModule
     }
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>