diff --git a/inc/SP/Controller/ItemShowController.class.php b/inc/SP/Controller/ItemShowController.class.php index 25964608..2df866b2 100644 --- a/inc/SP/Controller/ItemShowController.class.php +++ b/inc/SP/Controller/ItemShowController.class.php @@ -572,18 +572,6 @@ class ItemShowController extends ControllerBase implements ActionsInterface, Ite $this->JsonResponse->setStatus(0); } - /** - * Comprobar si la sesión está activa - * - * @throws \SP\Core\Exceptions\SPException - */ - protected function checkSession() - { - if (!Init::isLoggedIn()) { - Util::logout(); - } - } - /** * Obtener los datos para la vista de archivos de una cuenta * diff --git a/inc/SP/Controller/RequestControllerTrait.class.php b/inc/SP/Controller/RequestControllerTrait.class.php index 92178654..17ec1765 100644 --- a/inc/SP/Controller/RequestControllerTrait.class.php +++ b/inc/SP/Controller/RequestControllerTrait.class.php @@ -29,7 +29,9 @@ use SP\Core\Messages\LogMessage; use SP\Core\SessionUtil; use SP\Http\JsonResponse; use SP\Http\Request; +use SP\Util\Checks; use SP\Util\Json; +use SP\Util\Util; /** * Class RequestControllerTrait @@ -119,9 +121,13 @@ trait RequestControllerTrait protected function checkSession() { if (!Init::isLoggedIn()) { - $this->JsonResponse->setDescription(__('La sesión no se ha iniciado o ha caducado', false)); - $this->JsonResponse->setStatus(10); - Json::returnJson($this->JsonResponse); + if (Checks::isJson()) { + $this->JsonResponse->setDescription(__('La sesión no se ha iniciado o ha caducado', false)); + $this->JsonResponse->setStatus(10); + Json::returnJson($this->JsonResponse); + } else { + Util::logout(); + } } } } \ No newline at end of file