From af92968ba2b860e15a2fcf77933fef60dd17997c Mon Sep 17 00:00:00 2001
From: adiouf <adiouf@afi-sa.fr>
Date: Tue, 9 May 2017 14:08:27 +0200
Subject: [PATCH] dev #59639 Multimedia supprimer besoin auth pour question
devices : fix retour revue tech
---
.../modules/opac/controllers/MultimediaController.php | 8 ++++----
library/Class/Multimedia/AbstractRequest.php | 6 +++---
library/Class/Multimedia/AuthenticateRequest.php | 11 -----------
library/Class/Multimedia/HoldRequest.php | 11 -----------
4 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/application/modules/opac/controllers/MultimediaController.php b/application/modules/opac/controllers/MultimediaController.php
index 66e48552ed7..d0d49235c81 100644
--- a/application/modules/opac/controllers/MultimediaController.php
+++ b/application/modules/opac/controllers/MultimediaController.php
@@ -38,7 +38,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
$response = new StdClass();
$response->auth = 0;
- $request = Class_Multimedia_AuthenticateRequest::getInstance()->authenticate($this->_request);
+ $request = (new Class_Multimedia_AuthenticateRequest())->authenticate($this->_request);
if (!$request->isValid()) {
$response->error = $request->getError();
@@ -61,7 +61,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
$response = new StdClass();
$response->auth = 0;
- $request = Class_Multimedia_HoldRequest::getInstance()->holdDevice($this->_request);
+ $request = (new Class_Multimedia_HoldRequest())->holdDevice($this->_request);
if ($user = $request->getUser())
$response = $this->_initInfosUser($user, $response);
@@ -87,7 +87,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
$response = new StdClass();
$response->auth = 0;
- $request = Class_Multimedia_HoldRequest::getInstance()->closeHoldingDevice($this->_request);
+ $request = (new Class_Multimedia_HoldRequest())>closeHoldingDevice($this->_request);
if (!$request->isValid()) {
$response->error = $request->getError();
@@ -106,7 +106,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
$response = new StdClass();
- $request = Class_Multimedia_HoldRequest::getInstance()->isHoldableDay($this->_request);
+ $request = (new Class_Multimedia_HoldRequest())->isHoldableDay($this->_request);
if (!$request->isValid()) {
$response->error = $request->getError();
diff --git a/library/Class/Multimedia/AbstractRequest.php b/library/Class/Multimedia/AbstractRequest.php
index 813fd5be718..4f6d264a598 100644
--- a/library/Class/Multimedia/AbstractRequest.php
+++ b/library/Class/Multimedia/AbstractRequest.php
@@ -47,9 +47,9 @@ class Class_Multimedia_AbstractRequest {
if (!$auth->authenticateLoginPassword($login,
$password,
[$auth->newAuthSIGB(), $auth->newAuthDb()])) {
- if (Class_Users::findFirstBy(['login' => $login]))
- return $this->_error('PasswordIsWrong');
- return $this->_error('UserNotFound');
+ return (Class_Users::findFirstBy(['login' => $login]))
+ ? $this->_error('PasswordIsWrong')
+ : $this->_error('UserNotFound');
}
$user = Class_Users::getIdentity();
diff --git a/library/Class/Multimedia/AuthenticateRequest.php b/library/Class/Multimedia/AuthenticateRequest.php
index d63208f028e..656fd8683df 100644
--- a/library/Class/Multimedia/AuthenticateRequest.php
+++ b/library/Class/Multimedia/AuthenticateRequest.php
@@ -21,17 +21,6 @@
class Class_Multimedia_AuthenticateRequest extends Class_Multimedia_AbstractRequest{
-
- /**
- * @param Zend_Controller_Request_Abstract
- * @return Class_Multimedia_AuthenticateRequest
- */
-
- public static function getInstance() {
- return new self();
- }
-
-
/**
* @param Zend_Controller_Request_Abstract
* @return Class_Multimedia_AuthenticateRequest
diff --git a/library/Class/Multimedia/HoldRequest.php b/library/Class/Multimedia/HoldRequest.php
index 0611e05fd7d..001753e6306 100644
--- a/library/Class/Multimedia/HoldRequest.php
+++ b/library/Class/Multimedia/HoldRequest.php
@@ -37,17 +37,6 @@ class Class_Multimedia_HoldRequest extends Class_Multimedia_AbstractRequest{
/** @var boolean */
protected $_successHolding = false;
-
- /**
- * @param Zend_Controller_Request_Abstract
- * @return Class_Multimedia_HoldRequest
- */
-
- public static function getInstance() {
- return new self();
- }
-
-
/**
* @param Zend_Controller_Request_Abstract
* @return Class_Multimedia_HoldRequest
--
GitLab