From 2251f9ca7b390ecc5e437770c875a479737ba607 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Fri, 29 Apr 2011 14:33:24 +0200 Subject: [PATCH] Small improvements on Xnet accounts validation. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- include/validations/account.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/validations/account.inc.php b/include/validations/account.inc.php index 2cbc3cc..6c380db 100644 --- a/include/validations/account.inc.php +++ b/include/validations/account.inc.php @@ -98,7 +98,7 @@ class AccountReq extends Validate $this->uid, $this->hruid, $this->email, $hash); $mailer = new PlMailer('xnet/account.mail.tpl'); - $mailer->addTo($this->email); + $mailer->setTo($this->email); $mailer->assign('hash', $hash); $mailer->assign('hruid', $this->hruid); $mailer->assign('group', $this->group); @@ -118,12 +118,13 @@ class AccountReq extends Validate WHERE type = \'account\' ORDER BY stamp'); - $is_pending = false; while (list($data) = $res->next()) { $request = Validate::unserialize($data); - $is_pending = ($is_pending || ($request->uid == $uid)); + if ($request->uid == $uid) { + return true; + } } - return $is_pending; + return false; } // }}} -- 2.1.4