Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master

[platal.git] / include / reminder / ml.inc.php

diff --git a/include/reminder/ml.inc.php b/include/reminder/ml.inc.php
index 9732bb2..c5ee810 100644 (file)
--- a/include/reminder/ml.inc.php
+++ b/include/reminder/ml.inc.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   *
@@ -36,11 +36,10 @@ class ReminderMl extends Reminder
                                 S::i('uid'));
             while (list($sub, $domain) = $res->next()) {
                 if (array_shift($subs) == "$sub@$domain") {
-                    list($sub, $domain) = explode('@', $list);
                     if ($domain != $current_domain) {
                         $current_domain = $domain;
-                        $client = new MMList(S::v('uid'), S::v('password'), $domain);
                     }
+                    $client = new MMList(S::user(), $domain);
                     $client->subscribe($sub);
                 }
             }
@@ -73,7 +72,7 @@ class ReminderMl extends Reminder
         while (list($sub, $domain) = $res->next()) {
             if ($current_domain != $domain) {
                 $current_domain = $domain;
-                $client = new MMList(S::v('uid'), S::v('password'), $domain);
+                $client = new MMList(S::user(), $domain);
             }
             list($details, ) = $client->get_members($sub);
             $lists["$sub@$domain"] = $details;