[RTFixed] Dev#176783 task#189903

library/Class/User/LostPass.php

@@ -22,7 +22,7 @@
 
 class Class_User_LostPass {
 
-  use Trait_TimeSource, Trait_Translator;
+  use Trait_TimeSource, Trait_Translator, Trait_Errors;
 
   const MAX_HOURS = 24;
   const TOKEN_SEPARATOR = '@';
@@ -52,7 +52,7 @@ class Class_User_LostPass {
     if (!$this->isValid(function($message) {return false;}))
       return new Class_User_LostPassSendNothing($this);
 
-    if ($this->_user->isSIGBProvidesResetPasswordService())
+    if ($this->_user->doesIlsProvidesResetPasswordService())
       return new Class_User_LostPassSIGBResetLink($this);
 
     return new Class_User_LostPassResetLink($this);
@@ -94,7 +94,7 @@ class Class_User_LostPass {
 
 
 abstract class Class_User_LostPassSender {
-  use Trait_Translator;
+  use Trait_Translator, Trait_Errors;
 
   protected $_lostpass;
 
@@ -109,10 +109,10 @@ abstract class Class_User_LostPassSender {
                           Class_Profil::getCurrentProfil()->getLibelle()),
                  $this->_contentFor($user),
                  $user->getMail());
+    if ($error)
+      $this->addError($error);
 
-    return $error
-      ? '<p class="error">' . $error . '</p>'
-      : $this->_successMessage();
+    return $this;
   }
 
 
@@ -176,8 +176,6 @@ class Class_User_LostPassResetLink extends Class_User_LostPassSender{
 
 class Class_User_LostPassSIGBResetLink extends Class_User_LostPassSender {
 
-  protected string $_error;
-
   public function sendTo($user) {
     $borrower = $user->getEmprunteur();
     $borrower->updateFromUser($user);
@@ -185,11 +183,10 @@ class Class_User_LostPassSIGBResetLink extends Class_User_LostPassSender {
     $response = $borrower->ensureService($user)
                          ->resetPassword();
 
-    $this->_error = $this->_hasError($response);
+    if ($error = $this->_hasError($message))
+      $this->addError($error);
 
-    return $this->_error
-      ? '<p class="error">' . $this->_error . '</p>'
-      : '';
+    return $this;
   }