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 @@
$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.' ]); ?>
$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.' ]); ?>
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 ); } });