From 5c36f3450982d120a623b22d5f689d38a8819d2f Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 12 Dec 2010 21:24:57 +0100 Subject: [PATCH] Fix invalid references to S::v('password') when building list-rpc clients. Signed-off-by: Florent Bruneau --- include/reminder/ml.inc.php | 4 ++-- modules/register.php | 2 +- modules/xnetgrp.php | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/reminder/ml.inc.php b/include/reminder/ml.inc.php index 2bb8ba3..c5ee810 100644 --- a/include/reminder/ml.inc.php +++ b/include/reminder/ml.inc.php @@ -39,7 +39,7 @@ class ReminderMl extends Reminder 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); } } @@ -72,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; diff --git a/modules/register.php b/modules/register.php index b2c4a3d..c70a365 100644 --- a/modules/register.php +++ b/modules/register.php @@ -372,7 +372,7 @@ class RegisterModule extends PLModule XDB::execute('INSERT IGNORE INTO group_members (uid, asso_id) VALUES ({?}, {?})', $uid, $asso_id); - $mmlist = new MMList($uid, S::v('password')); + $mmlist = new MMList($user); $mmlist->subscribe("promo" . S::v('promo')); } break; diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 5080fb5..a558cbf 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -249,8 +249,7 @@ class XnetGrpModule extends PLModule global $globals; $page->changeTpl('xnetgrp/mail.tpl'); - $mmlist = new MMList(S::v('uid'), S::v('password'), - $globals->asso('mail_domain')); + $mmlist = new MMList(S::user(), $globals->asso('mail_domain')); $page->assign('listes', $mmlist->get_lists()); $page->assign('user', S::user()); $page->addJsLink('ajax.js'); -- 2.1.4