From 33aed39f83ce5e1e8f600bda61d5e956e861ffef Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 4 Oct 2020 12:16:37 +0200 Subject: [PATCH] Diverses corrections --- core/layout/common.css | 8 -------- core/module/user/user.php | 2 +- module/blog/blog.php | 4 ++-- module/blog/view/article/article.php | 4 ++-- module/form/form.php | 6 +++--- module/form/view/config/config.php | 2 +- module/form/view/index/index.php | 2 +- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/core/layout/common.css b/core/layout/common.css index aa62b04e..fafe8f2f 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -1369,14 +1369,6 @@ th.col12 { padding-right: 10px; } -#userLoginCaptcha, -#formcaptcha, -#blogArticlecaptcha { - width: 20%; - text-align: center; - margin: auto; -} - /* * Couleur des icônes + et - */ diff --git a/core/module/user/user.php b/core/module/user/user.php index 89460fbe..f26a61e9 100644 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -339,7 +339,7 @@ class user extends common { //$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 ) { - self::$inputNotices['blogArticlecaptcha'] = 'Incorrect'; + self::$inputNotices['userLoginCaptcha'] = 'Incorrect'; } // Lire Id du compte diff --git a/module/blog/blog.php b/module/blog/blog.php index 97483229..0b37766d 100644 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -343,9 +343,9 @@ class blog extends common { if( $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 password_verify($this->getInput('blogArticleCapcha', helper::FILTER_INT), $this->getInput('blogArticleCapchaResult') ) === false ) + AND password_verify($this->getInput('blogArticleCaptcha', helper::FILTER_INT), $this->getInput('blogArticleCaptchaResult') ) === false ) { - self::$inputNotices['blogArticleCapcha'] = 'Incorrect'; + self::$inputNotices['blogArticleCaptcha'] = 'Incorrect'; } // Crée le commentaire $commentId = helper::increment(uniqid(), $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'comment'])); diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 147583d1..3e9ef09d 100644 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -77,8 +77,8 @@ ]); ?> getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')): ?>
-
- +
+
diff --git a/module/form/form.php b/module/form/form.php index 39876b7c..6c11b2df 100644 --- a/module/form/form.php +++ b/module/form/form.php @@ -77,7 +77,7 @@ class form extends common { 'config', [ '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), 'user' => self::$listUsers [$this->getInput('formConfigUser', helper::FILTER_INT)], 'mail' => $this->getInput('formConfigMail') , @@ -283,9 +283,9 @@ class form extends common { if( $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 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 diff --git a/module/form/view/config/config.php b/module/form/view/config/config.php index 85db7110..00783b82 100644 --- a/module/form/view/config/config.php +++ b/module/form/view/config/config.php @@ -142,7 +142,7 @@ ]); ?>
- $this->getData(['module', $this->getUrl(0), 'config', 'captcha']) ]); ?> diff --git a/module/form/view/index/index.php b/module/form/view/index/index.php index 368d534e..ebf58f15 100644 --- a/module/form/view/index/index.php +++ b/module/form/view/index/index.php @@ -46,7 +46,7 @@ getData(['module', $this->getUrl(0), 'config', 'captcha'])): ?>
- +