From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 29 Apr 2011 12:33:24 +0000 (+0200)
Subject: Small improvements on Xnet accounts validation.
X-Git-Tag: xorg/1.1.1~45
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2251f9ca7b390ecc5e437770c875a479737ba607;p=platal.git

Small improvements on Xnet accounts validation.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

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;
     }
 
     // }}}