From b2ed7b48661df418fbffed8aef7f5861b811892b Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 14 Oct 2020 11:33:56 +0200 Subject: [PATCH 1/3] version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62d6cc21..7f76faf3 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS) -# ZwiiCMS 10.3.02 +# ZwiiCMS 10.3.03 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. From 0517dc4df41d08bdf1184bbc543e3e974f53dcb9 Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Thu, 15 Oct 2020 10:18:26 +0200 Subject: [PATCH 2/3] changes --- CHANGES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a6e78a22..2833c75e 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,10 +2,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 - Correction : From c5a4e1672600807ec10e8a817288b0058d8550d4 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 19 Oct 2020 18:19:50 +0200 Subject: [PATCH 3/3] captcha faible --- core/class/template.class.php | 2 +- core/core.php | 2 +- core/module/config/config.php | 2 +- core/module/config/view/index/index.php | 6 +++--- core/module/install/ressource/defaultdata.php | 1 + core/module/user/view/login/login.php | 2 +- module/blog/view/article/article.php | 2 +- module/form/view/index/index.php | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) 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 04462acb..4601ff8f 100644 --- a/core/core.php +++ b/core/core.php @@ -1424,7 +1424,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 db70d2c5..728209b6 100644 --- a/core/module/config/view/index/index.php +++ b/core/module/config/view/index/index.php @@ -100,9 +100,9 @@ ]); ?>
- $this->getData(['config', 'connect','captcha10']), - 'help' => 'Addition limitée aux chiffres de 0 à 9. S\'applique à tous les captchas du site.' + $this->getData(['config', 'captchaStrong']), + 'help' => 'Addition de nombres de 0 à 20.' ]); ?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 36e90661..653903da 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -16,6 +16,7 @@ class init extends common { 'legalPageId' => 'mentions-legales', 'searchPageId' => 'recherche', 'maintenance' => false, + 'captchaStrong' => false, 'social' => [ 'facebookId' => 'facebook', 'instagramId' => '', diff --git a/core/module/user/view/login/login.php b/core/module/user/view/login/login.php index a7219ce6..43b59702 100644 --- a/core/module/user/view/login/login.php +++ b/core/module/user/view/login/login.php @@ -16,7 +16,7 @@
$this->getData(['config','connect','captcha10']) + 'limit' => $this->getData(['config','captchaStrong']) ]); ?>
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 6e700bdd..0e48c040 100644 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -80,7 +80,7 @@
$this->getData(['config','connect','captcha10']) + 'limit' => $this->getData(['config','captchaStrong']) ]); ?>
diff --git a/module/form/view/index/index.php b/module/form/view/index/index.php index 02b082e2..1a10764c 100644 --- a/module/form/view/index/index.php +++ b/module/form/view/index/index.php @@ -47,7 +47,7 @@
$this->getData(['config','connect','captcha10']) + 'limit' => $this->getData(['config','captchaStrong']) ]); ?>