ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 146 Activity

Merge branch '10302' into import_user

This commit is contained in:
Fred Tempez 2020-10-06 18:36:09 +02:00
parent 2f97898e6e ef6928547b
commit fe7a6f3ca0
2 changed files with 111 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,8 +344,9 @@ class user extends common {
if($this->isPost()) { if($this->isPost()) {
// Check la captcha // Check la captcha
if( if(
$this->getData(['config','connect','captcha'])
//$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 ) AND password_verify($this->getInput('userLoginCaptcha', helper::FILTER_INT), $this->getInput('userLoginCaptchaResult') ) === false )
{ {
self::$inputNotices['userLoginCaptcha'] = 'Incorrect'; self::$inputNotices['userLoginCaptcha'] = 'Incorrect';
} }

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

@ -1,3 +1,4 @@
<article>
<div class="row"> <div class="row">
<div class="col10"> <div class="col10">
<div class="blogDate"> <div class="blogDate">
@ -118,3 +119,4 @@
</div> </div>
</div> </div>
<?php echo $module::$pages; ?> <?php echo $module::$pages; ?>
</article>