diff --git a/CHANGES.md b/CHANGES.md index 786ccdfd..00b6e6ed 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,10 +15,10 @@ ## version 10.3.03 - Correction : - - Doublons de lignes. + - Localisation, affichage des accents, LC_TIME devient LC_ALL - Modifications : - Configuration des captcha. Addition simple chiffres de 0 à 9. - - Une icône remplace le terme Connexion dans le menu et dans le pied de page. + - Une icône remplace Connexion dans le menu et dans le pied de page. ## version 10.3.02 - Corrections : diff --git a/core/class/template.class.php b/core/class/template.class.php index d8f8f6d8..e7b9551f 100644 --- a/core/class/template.class.php +++ b/core/class/template.class.php @@ -52,7 +52,7 @@ class template { // Génère deux nombres pour le captcha $numbers = array(0,1,2,3,4,5,6,7,8,9,10,12,13,14,15,16,17,18,19,20); $letters = array('u','t','s','r','q','p','o','n','m','l','k','j','i','h','g','f','e','d','c','b','a'); - $limit = $attributes['limit'] ? 9 : count($letters)-1 ; + $limit = $attributes['limit'] ? count($letters)-1 : 10 ; $firstNumber = rand ( 0 , $limit ); $secondNumber = rand ( 0 , $limit ); $result = $firstNumber + $secondNumber; diff --git a/core/core.php b/core/core.php index 81709e99..7cc63898 100644 --- a/core/core.php +++ b/core/core.php @@ -1473,7 +1473,7 @@ class common { // Version 10.3.03 if ($this->getData(['core', 'dataVersion']) < 10303) { // Activation par défaut du captcha à la connexion - $this->setData(['config', 'connect','captcha10', false]); + $this->setData(['config', 'captchaStrong', false]); $this->setData(['core', 'dataVersion', 10303]); } } diff --git a/core/module/config/config.php b/core/module/config/config.php index b97d1481..13e474b5 100644 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -470,6 +470,7 @@ class config extends common { 'proxyType' => $this->getInput('configProxyType'), 'proxyUrl' => $this->getInput('configProxyUrl'), 'proxyPort' => $this->getInput('configProxyPort',helper::FILTER_INT), + 'captchaStrong' => $this->getInput('configCaptchaStrong',helper::FILTER_BOOLEAN), 'smtp' => [ 'enable' => $this->getInput('configSmtpEnable',helper::FILTER_BOOLEAN), 'host' => $this->getInput('configSmtpHost',helper::FILTER_STRING_SHORT), @@ -485,7 +486,6 @@ class config extends common { 'timeout' => $this->getInput('configConnectTimeout',helper::FILTER_INT), 'log' => $this->getInput('configConnectLog',helper::FILTER_BOOLEAN), 'captcha' => $this->getInput('configConnectCaptcha',helper::FILTER_BOOLEAN), - 'captcha10' => $this->getInput('configConnectCaptcha10',helper::FILTER_BOOLEAN) ] ] ]); diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php index 007b3d85..5d16c250 100644 --- a/core/module/config/view/index/index.php +++ b/core/module/config/view/index/index.php @@ -100,9 +100,9 @@ ]); ?>