From 26f88cbb26ea0839760b1a01e2d745de189667b4 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Tue, 29 Sep 2020 19:03:35 +0200
Subject: [PATCH] init

---
 core/module/config/config.php           | 3 ++-
 core/module/config/view/index/index.php | 9 ++++++++-
 core/module/user/user.php               | 8 ++++++++
 core/module/user/view/login/login.php   | 8 +++++++-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/core/module/config/config.php b/core/module/config/config.php
index 93c0beed..835490eb 100644
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@@ -483,7 +483,8 @@ class config extends common {
 					'connect' => [
 						'attempt' => $this->getInput('configConnectAttempt',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)
 					]
 				]
 			]);
diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php
index 97ec4a6a..25307562 100644
--- a/core/module/config/view/index/index.php
+++ b/core/module/config/view/index/index.php
@@ -94,7 +94,7 @@
 						'help' => 'Le fuseau horaire est utile au bon référencement'
 					]); ?>
 				</div>
-				<div class="col8 verticalAlignBottom">
+				<div class="col4 verticalAlignBottom">
 					<?php echo template::checkbox('configCookieConsent', true, 'Message de consentement aux cookies', [
 						'checked' => $this->getData(['config', 'cookieConsent'])
 					]); ?>
@@ -499,6 +499,13 @@
 						]); ?>
 					</div>
 				</div>
+				<div class="row">
+					<div class="col4">
+						<?php echo template::checkbox('configConnectCaptcha', true, 'Captcha à la connexion', [
+							'checked' => $this->getData(['config', 'connect','captcha'])
+						]); ?>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/core/module/user/user.php b/core/module/user/user.php
index c4fb8ca5..77b0526c 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -334,6 +334,14 @@ class user extends common {
 	public function login() {
 		// Soumission du formulaire
 		if($this->isPost()) {
+			// Check la captcha
+			if(
+				$this->getInput('userLoginCaptcha', helper::FILTER_INT) !== $this->getInput('userLoginCaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('userLoginCaptchaSecondNumber', helper::FILTER_INT))
+			{
+				self::$inputNotices['blogArticlecaptcha'] = 'Incorrect';
+			}
+
+			// Lire Id du compte
 			$userId = $this->getInput('userLoginId', helper::FILTER_ID, true);
 
 			/**
diff --git a/core/module/user/view/login/login.php b/core/module/user/view/login/login.php
index 3a1af756..e349d1d4 100644
--- a/core/module/user/view/login/login.php
+++ b/core/module/user/view/login/login.php
@@ -12,6 +12,13 @@
 			]); ?>
 		</div>
 	</div>
+	<?php if ($this->getData(['config', 'connect','captcha'])): ?>
+		<div class="row">
+			<div class="col6">
+				<?php echo template::captcha('userLoginCaptcha'); ?>
+			</div>
+		</div>
+	<?php endif;?>
 	<div class="row">
 		<div class="col6">
 			<?php echo template::checkbox('userLoginLongTime', true, 'Se souvenir de moi', [
@@ -25,7 +32,6 @@
 	<div class="row">
 		<div class="col3 offset6">
 			<?php echo template::button('userLoginBack', [
-				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . str_replace('_', '/', str_replace('__', '#', $this->getUrl(2))),
 				'ico' => 'left',
 				'value' => 'Annuler'