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

Merge branch '10302' into blog_v3

Browse Source
This commit is contained in:
Fred Tempez 2020-10-04 12:17:59 +02:00
commit e181178a54
7 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -13,6 +13,8 @@
- Approbation des commentaires - Approbation des commentaires
## version 10.3.02 ## version 10.3.02
- Correction :
- Icône de pied de page github manquante.
- Modifications : - Modifications :
- Nouvelles images de captcha. - Nouvelles images de captcha.
- Option de configuration, captcha demandé à la connexion. - Option de configuration, captcha demandé à la connexion.

8
core/layout/common.css
View File

@ -1369,14 +1369,6 @@ th.col12 {
padding-right: 10px; padding-right: 10px;
} }
#userLoginCaptcha,
#formcaptcha,
#blogArticlecaptcha {
width: 20%;
text-align: center;
margin: auto;
}
/* /*
* Couleur des icônes + et - * Couleur des icônes + et -
*/ */

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

@ -358,7 +358,7 @@ class user extends common {
//$this->getInput('userLoginCaptcha', helper::FILTER_INT) !== $this->getInput('userLoginCaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('userLoginCaptchaSecondNumber', helper::FILTER_INT)) //$this->getInput('userLoginCaptcha', helper::FILTER_INT) !== $this->getInput('userLoginCaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('userLoginCaptchaSecondNumber', helper::FILTER_INT))
password_verify($this->getInput('userLoginCaptcha', helper::FILTER_INT), $this->getInput('userLoginCaptchaResult') ) === false ) password_verify($this->getInput('userLoginCaptcha', helper::FILTER_INT), $this->getInput('userLoginCaptchaResult') ) === false )
{ {
self::$inputNotices['blogArticlecaptcha'] = 'Incorrect'; self::$inputNotices['userLoginCaptcha'] = 'Incorrect';
} }
// Lire Id du compte // Lire Id du compte

5
module/blog/blog.php
View File

@ -511,9 +511,10 @@ class blog extends common {
// Check la captcha // Check la captcha
if( if(
$this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
AND $this->getInput('blogArticlecaptcha', helper::FILTER_INT) !== $this->getInput('blogArticlecaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('blogArticlecaptchaSecondNumber', helper::FILTER_INT)) //AND $this->getInput('blogArticlecaptcha', helper::FILTER_INT) !== $this->getInput('blogArticlecaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('blogArticlecaptchaSecondNumber', helper::FILTER_INT))
AND password_verify($this->getInput('blogArticleCaptcha', helper::FILTER_INT), $this->getInput('blogArticleCaptchaResult') ) === false )
{ {
self::$inputNotices['blogArticlecaptcha'] = 'Incorrect'; self::$inputNotices['blogArticleCaptcha'] = 'Incorrect';
} }
// Crée le commentaire // Crée le commentaire
$commentId = helper::increment(uniqid(), $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'comment'])); $commentId = helper::increment(uniqid(), $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'comment']));

6
module/form/form.php
View File

@ -77,7 +77,7 @@ class form extends common {
'config', 'config',
[ [
'button' => $this->getInput('formConfigButton'), 'button' => $this->getInput('formConfigButton'),
'captcha' => $this->getInput('formConfigcaptcha', helper::FILTER_BOOLEAN), 'captcha' => $this->getInput('formConfigCaptcha', helper::FILTER_BOOLEAN),
'group' => $this->getInput('formConfigGroup', helper::FILTER_INT), 'group' => $this->getInput('formConfigGroup', helper::FILTER_INT),
'user' => self::$listUsers [$this->getInput('formConfigUser', helper::FILTER_INT)], 'user' => self::$listUsers [$this->getInput('formConfigUser', helper::FILTER_INT)],
'mail' => $this->getInput('formConfigMail') , 'mail' => $this->getInput('formConfigMail') ,
@ -283,9 +283,9 @@ class form extends common {
if( if(
$this->getData(['module', $this->getUrl(0), 'config', 'captcha']) $this->getData(['module', $this->getUrl(0), 'config', 'captcha'])
// AND $this->getInput('formcaptcha', helper::FILTER_INT) !== $this->getInput('formcaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('formcaptchaSecondNumber', helper::FILTER_INT)) // AND $this->getInput('formcaptcha', helper::FILTER_INT) !== $this->getInput('formcaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('formcaptchaSecondNumber', helper::FILTER_INT))
AND password_verify($this->getInput('formcaptcha', helper::FILTER_INT), $this->getInput('formcaptchaResult') ) === false ) AND password_verify($this->getInput('formCaptcha', helper::FILTER_INT), $this->getInput('formCaptchaResult') ) === false )
{ {
self::$inputNotices['formcaptcha'] = 'Incorrect'; self::$inputNotices['formCaptcha'] = 'Incorrect';
} }
// Préparation le contenu du mail // Préparation le contenu du mail

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

@ -142,7 +142,7 @@
]); ?> ]); ?>
</div> </div>
</div> </div>
<?php echo template::checkbox('formConfigcaptcha', true, 'Valider un captcha afin de soumettre le formulaire.', [ <?php echo template::checkbox('formConfigCaptcha', true, 'Valider un captcha afin de soumettre le formulaire.', [
'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'captcha']) 'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'captcha'])
]); ?> ]); ?>
</div> </div>

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

@ -46,7 +46,7 @@
<?php if($this->getData(['module', $this->getUrl(0), 'config', 'captcha'])): ?> <?php if($this->getData(['module', $this->getUrl(0), 'config', 'captcha'])): ?>
<div class="row"> <div class="row">
<div class="col5"> <div class="col5">
<?php echo template::captcha('formcaptcha'); ?> <?php echo template::captcha('formCaptcha'); ?>
</div> </div>
</div> </div>
<?php endif; ?> <?php endif; ?>