remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Merge branch '10303' into 10400

Browse Source
This commit is contained in:
Fred Tempez 2020-10-19 18:20:55 +02:00
commit 8abe700c42
9 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -15,10 +15,10 @@
## version 10.3.03 ## version 10.3.03
- Correction : - Correction :
- Doublons de lignes. - Localisation, affichage des accents, LC_TIME devient LC_ALL
- Modifications : - Modifications :
- Configuration des captcha. Addition simple chiffres de 0 à 9. - 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 ## version 10.3.02
- Corrections : - Corrections :

2
core/class/template.class.php
View File

@ -52,7 +52,7 @@ class template {
// Génère deux nombres pour le captcha // 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); $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'); $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 ); $firstNumber = rand ( 0 , $limit );
$secondNumber = rand ( 0 , $limit ); $secondNumber = rand ( 0 , $limit );
$result = $firstNumber + $secondNumber; $result = $firstNumber + $secondNumber;

2
core/core.php
View File

@ -1473,7 +1473,7 @@ class common {
// Version 10.3.03 // Version 10.3.03
if ($this->getData(['core', 'dataVersion']) < 10303) { if ($this->getData(['core', 'dataVersion']) < 10303) {
// Activation par défaut du captcha à la connexion // Activation par défaut du captcha à la connexion
$this->setData(['config', 'connect','captcha10', false]); $this->setData(['config', 'captchaStrong', false]);
$this->setData(['core', 'dataVersion', 10303]); $this->setData(['core', 'dataVersion', 10303]);
} }
} }

2
core/module/config/config.php
View File

@ -470,6 +470,7 @@ class config extends common {
'proxyType' => $this->getInput('configProxyType'), 'proxyType' => $this->getInput('configProxyType'),
'proxyUrl' => $this->getInput('configProxyUrl'), 'proxyUrl' => $this->getInput('configProxyUrl'),
'proxyPort' => $this->getInput('configProxyPort',helper::FILTER_INT), 'proxyPort' => $this->getInput('configProxyPort',helper::FILTER_INT),
'captchaStrong' => $this->getInput('configCaptchaStrong',helper::FILTER_BOOLEAN),
'smtp' => [ 'smtp' => [
'enable' => $this->getInput('configSmtpEnable',helper::FILTER_BOOLEAN), 'enable' => $this->getInput('configSmtpEnable',helper::FILTER_BOOLEAN),
'host' => $this->getInput('configSmtpHost',helper::FILTER_STRING_SHORT), 'host' => $this->getInput('configSmtpHost',helper::FILTER_STRING_SHORT),
@ -485,7 +486,6 @@ class config extends common {
'timeout' => $this->getInput('configConnectTimeout',helper::FILTER_INT), 'timeout' => $this->getInput('configConnectTimeout',helper::FILTER_INT),
'log' => $this->getInput('configConnectLog',helper::FILTER_BOOLEAN), 'log' => $this->getInput('configConnectLog',helper::FILTER_BOOLEAN),
'captcha' => $this->getInput('configConnectCaptcha',helper::FILTER_BOOLEAN), 'captcha' => $this->getInput('configConnectCaptcha',helper::FILTER_BOOLEAN),
'captcha10' => $this->getInput('configConnectCaptcha10',helper::FILTER_BOOLEAN)
] ]
] ]
]); ]);

6
core/module/config/view/index/index.php
View File

@ -100,9 +100,9 @@
]); ?> ]); ?>
</div> </div>
<div class="col4 verticalAlignBottom"> <div class="col4 verticalAlignBottom">
<?php echo template::checkbox('configConnectCaptcha10', true, 'Captcha simple', [ <?php echo template::checkbox('configCaptchaStrong', true, 'Captcha simple', [
'checked' => $this->getData(['config', 'connect','captcha10']), 'checked' => $this->getData(['config', 'captchaStrong']),
'help' => 'Addition limitée aux chiffres de 0 à 9. S\'applique à tous les captchas du site.' 'help' => 'Addition de nombres de 0 à 20.'
]); ?> ]); ?>
</div> </div>
</div> </div>

1
core/module/install/ressource/defaultdata.php
View File

@ -16,6 +16,7 @@ class init extends common {
'legalPageId' => 'mentions-legales', 'legalPageId' => 'mentions-legales',
'searchPageId' => 'recherche', 'searchPageId' => 'recherche',
'maintenance' => false, 'maintenance' => false,
'captchaStrong' => false,
'social' => [ 'social' => [
'facebookId' => 'facebook', 'facebookId' => 'facebook',
'instagramId' => '', 'instagramId' => '',

2
core/module/user/view/login/login.php
View File

@ -16,7 +16,7 @@
<div class="row"> <div class="row">
<div class="col12 textAlignCenter"> <div class="col12 textAlignCenter">
<?php echo template::captcha('userLoginCaptcha', [ <?php echo template::captcha('userLoginCaptcha', [
'limit' => $this->getData(['config','connect','captcha10']) 'limit' => $this->getData(['config','captchaStrong'])
]); ?> ]); ?>
</div> </div>
</div> </div>

2
module/blog/view/article/article.php
View File

@ -98,7 +98,7 @@
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<?php echo template::captcha('blogArticleCaptcha', [ <?php echo template::captcha('blogArticleCaptcha', [
'limit' => $this->getData(['config','connect','captcha10']) 'limit' => $this->getData(['config','captchaStrong'])
]); ?> ]); ?>
</div> </div>
</div> </div>

2
module/form/view/index/index.php
View File

@ -47,7 +47,7 @@
<div class="row"> <div class="row">
<div class="col5"> <div class="col5">
<?php echo template::captcha('formCaptcha', [ <?php echo template::captcha('formCaptcha', [
'limit' => $this->getData(['config','connect','captcha10']) 'limit' => $this->getData(['config','captchaStrong'])
]); ?> ]); ?>
</div> </div>
</div> </div>