From 6a5a50a2f82b1ba4fb3197a41f427a08c1bbf35b Mon Sep 17 00:00:00 2001 From: afornerot Date: Tue, 9 Mar 2021 09:59:37 +0100 Subject: [PATCH] correctif item sso optionnel --- .../src/Cadoles/CASBundle/Controller/SecurityController.php | 6 +++--- src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php b/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php index 3cfb2a89..b0667cb5 100644 --- a/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php +++ b/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php @@ -30,7 +30,7 @@ class SecurityController extends Controller // Init Client CAS \phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log"); - \phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); + @\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); \phpCAS::setNoCasServerValidation(); @@ -194,7 +194,7 @@ class SecurityController extends Controller public function logoutAction() { // Init Client CAS \phpCAS::setDebug(false); - \phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), true); + @\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), true); \phpCAS::setNoCasServerValidation(); @@ -208,7 +208,7 @@ class SecurityController extends Controller // Init Client CAS \phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log"); - \phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); + @\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); \phpCAS::setNoCasServerValidation(); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php index 06e61041..016c9b39 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php @@ -137,6 +137,7 @@ class ItemType extends AbstractType if($options["ssosynchroitem"]) { $builder->add("ssoitem", TextType::class, [ "label" => "Visible si attribut SSO ".$options["user_attr_cas_item"]." égale à", + "required" => false, "disabled" => ($options["mode"]=="delete"?true:false), ]); }