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

Revert "captcha simple par défaut - changement de structure de stockage"

Browse Source 
This reverts commit 87d8f2a22a.
This commit is contained in:
Fred Tempez 2020-10-19 18:20:23 +02:00
parent 87d8f2a22a
commit 5427853357
8 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'] ? count($letters)-1 : 10 ;
$limit = $attributes['limit'] ? 9 : count($letters)-1 ;
$firstNumber = rand ( 0 , $limit );
$secondNumber = rand ( 0 , $limit );
$result = $firstNumber + $secondNumber;

7
core/core.php
View File

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

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

@ -470,7 +470,6 @@ 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),
@ -486,6 +485,7 @@ 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)
]
]
]);

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

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

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

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

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

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

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

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

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

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