diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php index 8cf2e7cd0c14b0618b3d8d52b207f87c98deda79..01c12d498c97fe39cb1c192dd1bd0e10c1565298 100644 --- a/application/modules/opac/controllers/AuthController.php +++ b/application/modules/opac/controllers/AuthController.php @@ -83,9 +83,11 @@ class AuthController extends Zend_Controller_Action $viewRenderer->setLayoutScript('module.phtml'); if (strlen($this->_getParam('service'))>0) { - if (strlen($this->_getParam('deconnexion'))>0) - $this->_redirect('opac'); $this->view->service=$this->_getParam('service'); + + if (stristr($this->view->service,'deconnexion=ok') != FALSE) + return $this->_redirect('opac'); + } if($this->_request->isPost()) { $error = $this->_authenticate(); diff --git a/tests/application/modules/opac/controllers/AuthControllerTest.php b/tests/application/modules/opac/controllers/AuthControllerTest.php index 7b81d7caf42a9bd646a989686fda81bfdab8cf0d..c79fe9ee444e2d3f06eb2dbcc8215316701872fb 100644 --- a/tests/application/modules/opac/controllers/AuthControllerTest.php +++ b/tests/application/modules/opac/controllers/AuthControllerTest.php @@ -333,7 +333,7 @@ abstract class AuthControllerNumilogConnectedUserDeconnexionTest extends Portail public function setUp() { parent::setUp(); - $this->dispatch('/opac/auth/login?service=http://numilog&deconnexion=ok'); + $this->dispatch('/opac/auth/login?service=http://numilog?deconnexion=ok'); }