diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php index 1361374dbae76b1303ce9365344b6abe15b8819a..eca12a82a14285598aff7131626b71e53eba9742 100644 --- a/application/modules/opac/controllers/AuthController.php +++ b/application/modules/opac/controllers/AuthController.php @@ -166,17 +166,15 @@ public function urlServiceCas(){ } - function lostpassAction() - { - if($_POST) - { - $user=ZendAfi_Filters_Post::filterStatic($this->_request->getPost('username')); + function lostpassAction() { + if($_POST) { + $user = ZendAfi_Filters_Post::filterStatic($this->_request->getPost('username')); $classe_user = new Class_Users(); $ret=$classe_user->lostpass($user); $this->view->message=$this->messages[$ret["error"]]; $this->view->message_mail=$ret["message_mail"]; + $this->view->username=$user; } - $this->view->username=$user; } diff --git a/application/modules/opac/views/scripts/auth/lostpass.phtml b/application/modules/opac/views/scripts/auth/lostpass.phtml index e79ecefc83a62702eefad4be4d351104d0bc6e40..dad176ef9f8d41e70e1bc21f980d34376d36d4e5 100644 --- a/application/modules/opac/views/scripts/auth/lostpass.phtml +++ b/application/modules/opac/views/scripts/auth/lostpass.phtml @@ -1,22 +1,24 @@ -<?php -echo '<center>' -echo '<div class="form" style="margin-top:50px;margin-bottom:200px">'; -$this->openBoite($this->_current_module["preferences"]["titre"]); -// Message final -if($this->message_mail) - echo '<div align="center">'.$this->message_mail.'</div>'; -// Saisie nom d'utilisateur -else { echo ' - <form name="form_lostpass" action="'.BASE_URL.'/opac/auth/lostpass" method="post" style="margin:10px"> - <label for="username">'.$this->_('Identifiant').'</label> - <input type="text" name="username" id="username" size="20" value="'.$this->username.'"></input></form>'; - echo $this->bouton('type=V', 'form=form_lostpass'); - echo ' - <br/> - <div class="error" align="center">'.$this->message.'</div>'; - $this->closeBoite(); - echo '</div> -</center>'; -} -?> - +<?php +echo '<div style="margin:0 auto; text-align: center">'; +echo '<div class="form" style="margin-top:50px;margin-bottom:200px">'; +$this->openBoite($this->_current_module["preferences"]["titre"]); + + +if($this->message_mail) + echo '<div style="text-align:center">'.$this->message_mail.'</div>'; + +else { echo ' + <form name="form_lostpass" action="'.$this->url(['controller' => 'auth', 'action' => 'lostpass']).'" method="post" style="margin:10px"> + <label for="username">'.$this->_('Identifiant').'</label> + <input type="text" name="username" id="lost-username" size="20" value="'.$this->username.'"><br/><br/>'; + echo $this->bouton('type=V', 'form=form_lostpass'); + echo '</form>'; + echo ' + <br/> + <div class="error" style="text-align:center">'.$this->message.'</div>'; + $this->closeBoite(); + echo '</div> +</div>'; +} +?> + diff --git a/tests/application/modules/opac/controllers/AuthControllerTest.php b/tests/application/modules/opac/controllers/AuthControllerTest.php index f567e8a101d11d4974cae89d0638392c3a4fb7dc..820ec5017c06d65831d418ccdfeb63e64f878bee 100644 --- a/tests/application/modules/opac/controllers/AuthControllerTest.php +++ b/tests/application/modules/opac/controllers/AuthControllerTest.php @@ -724,9 +724,34 @@ class AuthControllerLoginActionWithDefaultPreferencesRenderTest extends AuthCont public function linkConnectionShouldHaveOnclickAttributeWithSubmit() { $this->assertXPath('//a[contains(@onclick, "submit")]'); } +} - + + +class AuthControllerLostPasswordTest extends AuthControllerNobodyLoggedTestCase { + public function setUp() { + parent::setUp(); + $this->dispatch('/opac/auth/lostpass', true); + } + + + /** @test */ + public function formActionShouldBeLostPass() { + $this->assertXPath('//form[@name="form_lostpass"][contains(@action, "/auth/lostpass")]'); + } + + + /** @test */ + public function formShouldContainsInputForUsername() { + $this->assertXPath('//form/input[@type="text"][@name="username"]'); + } + + + /** @test */ + public function pageShouldBeHTML5Valid() { + $this->assertHTML5(); + } } ?> \ No newline at end of file