From 16817dcfea91b3470706cc7f092dd45d36c4ff2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sun, 19 Dec 2021 15:51:41 +0100
Subject: [PATCH] =?UTF-8?q?Bug=20captcha=20strong=20+=20m=C3=A9nage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/config/config.php               |  3 +--
 core/module/config/view/connect/connect.php |  4 ++--
 core/module/config/view/index/index.js.php  | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/module/config/config.php b/core/module/config/config.php
index 18631254..68061356 100644
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@@ -508,8 +508,7 @@ class config extends common {
 						'captchaStrong' => $this->getInput('connectCaptchaStrong',helper::FILTER_BOOLEAN),
 						'autoDisconnect' => $this->getInput('connectAutoDisconnect',helper::FILTER_BOOLEAN),
 						'captchaType' => $this->getInput('connectCaptchaType'),
-						'showPassword' => $this->getInput('connectShowPassword',helper::FILTER_BOOLEAN),
-						
+						'showPassword' => $this->getInput('connectShowPassword',helper::FILTER_BOOLEAN)
 					],
 					'i18n' => [
 						'enable' 			=> $this->getInput('localei18n',helper::FILTER_BOOLEAN),
diff --git a/core/module/config/view/connect/connect.php b/core/module/config/view/connect/connect.php
index be56b9ef..789fbb08 100644
--- a/core/module/config/view/connect/connect.php
+++ b/core/module/config/view/connect/connect.php
@@ -31,13 +31,13 @@
 					</div>
 					<div class="col3">
 						<?php echo template::checkbox('connectAutoDisconnect', true, 'Déconnexion automatique', [
-							'checked' => $this->getData(['config','connect', 'autoDisconnect']),
+							'checked' => $this->getData(['config', 'connect', 'autoDisconnect']),
 							'help' => 'Déconnecte les sessions ouvertes précédemment sur d\'autres navigateurs ou terminaux. Activation recommandée.'
 						]); ?>
 					</div>
 					<div class="col3">
 						<?php echo template::checkbox('connectShowPassword', true, 'Dévoiler le mot de passe', [
-							'checked' => $this->getData(['config','connect', 'showPassword']),
+							'checked' => $this->getData(['config', 'connect', 'showPassword']),
 							'help' => 'Dans l\'écran de connexion, active une icône dont le survol affiche temporairement le mot de passe.'
 						]); ?>
 					</div>
diff --git a/core/module/config/view/index/index.js.php b/core/module/config/view/index/index.js.php
index 429dbce6..ee94b0e5 100644
--- a/core/module/config/view/index/index.js.php
+++ b/core/module/config/view/index/index.js.php
@@ -38,20 +38,20 @@ $( document).ready(function() {
     }
 
     /**
-     * Afficher etmasquer les option de captcha
+     * Afficher et masquer les options de captcha
      */
 
     if ($("input[name=connectCaptcha]").is(':checked')) {
         $("#connectCaptchaStrongWrapper").addClass("disabled");
         $("#connectCaptchaStrongWrapper").slideDown();
         $("#connectCaptchaTypeWrapper").addClass("disabled");
-        $("#connectCaptchaTypeWrapper").slideDown();
-        $( "#connectCaptchaStrong" ).prop( "checked", false );
+        $("#connectCaptchaTypeWrapper").slideDown();        
     } else {
         $("#connectCaptchaStrongWrapper").removeClass("disabled");
         $("#connectCaptchaStrongWrapper").slideUp();
         $("#connectCaptchaTypeWrapper").removeClass("disabled");
         $("#connectCaptchaTypeWrapper").slideUp();
+        $( "#connectCaptchaStrong" ).prop( "checked", false );
     }
 
     var configLayout = getCookie("configLayout");
@@ -130,14 +130,14 @@ $( document).ready(function() {
             $("#connectCaptchaStrongWrapper").addClass("disabled");
             $("#connectCaptchaStrongWrapper").slideDown();
             $("#connectCaptchaTypeWrapper").addClass("disabled");
-            $("#connectCaptchaTypeWrapper").slideDown();
-            
-            $( "#connectCaptchaStrong" ).prop( "checked", false );
+            $("#connectCaptchaTypeWrapper").slideDown();            
+           
         } else {
             $("#connectCaptchaStrongWrapper").removeClass("disabled");
             $("#connectCaptchaStrongWrapper").slideUp();
             $("#connectCaptchaTypeWrapper").removeClass("disabled");
             $("#connectCaptchaTypeWrapper").slideUp();
+            $( "#connectCaptchaStrong" ).prop( "checked", false );
         }
     });