From c266d916aca6f678814b0f1b4f8755d04a81c3a4 Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Fri, 27 Jan 2023 08:26:34 +0100
Subject: [PATCH] Form 3.4 bug div en trop

---
 module/form/changes.md           |  2 ++
 module/form/form.php             |  2 +-
 module/form/view/index/index.php | 42 ++++++++++++++++----------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/module/form/changes.md b/module/form/changes.md
index 58c618ca..31cb8d1e 100644
--- a/module/form/changes.md
+++ b/module/form/changes.md
@@ -1,3 +1,5 @@
+# Version 3.4
+- Bug de présentation, une div en trop.
 # Version 3.3
 - Multilinguisme
 # Version 3.2
diff --git a/module/form/form.php b/module/form/form.php
index aee00b38..61617bd9 100644
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -16,7 +16,7 @@
 
 class form extends common {
 
-	const VERSION = '3.3';
+	const VERSION = '3.4';
 	const REALNAME = 'Formulaire';
 	const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json)
 
diff --git a/module/form/view/index/index.php b/module/form/view/index/index.php
index c2251225..96a7d163 100644
--- a/module/form/view/index/index.php
+++ b/module/form/view/index/index.php
@@ -1,20 +1,19 @@
-<?php if($this->getData(['module', $this->getUrl(0), 'input'])): ?>
-<div class="row <?php echo $this->getData(['module', $this->getUrl(0), 'config', 'align']);?>">
-	<div class="<?php
+<?php if ($this->getData(['module', $this->getUrl(0), 'input'])): ?>
+	<div class="row <?php echo $this->getData(['module', $this->getUrl(0), 'config', 'align']); ?>">
+		<div class="<?php
 		echo 'col' . $this->getData(['module', $this->getUrl(0), 'config', 'width']) . ' ';
 		echo $this->getData(['module', $this->getUrl(0), 'config', 'offset']) !== 0 ? 'offset' . $this->getData(['module', $this->getUrl(0), 'config', 'offset']) : '';
-	?>">
-		<?php echo template::formOpen('formForm'); ?>
-			<?php foreach($this->getData(['module', $this->getUrl(0), 'input']) as $index => $input): ?>
-				<?php if($input['type'] === $module::TYPE_MAIL): ?>
+		?>">
+			<?php echo template::formOpen('formForm'); ?>
+			<?php foreach ($this->getData(['module', $this->getUrl(0), 'input']) as $index => $input): ?>
+				<?php if ($input['type'] === $module::TYPE_MAIL): ?>
 					<?php echo template::mail('formInput[' . $index . ']', [
 						'id' => 'formInput_' . $index,
 						'label' => $input['name']
 					]); ?>
-				<?php elseif($input['type'] === $module::TYPE_SELECT): ?>
+				<?php elseif ($input['type'] === $module::TYPE_SELECT): ?>
 					<?php
-					$values = array_flip(explode(',', $input['values']));
-					foreach($values as $value => $key) {
+					$values = array_flip(explode(',', $input['values'])); foreach ($values as $value => $key) {
 						$values[$value] = trim($value);
 					}
 					?>
@@ -22,38 +21,40 @@
 						'id' => 'formInput_' . $index,
 						'label' => $input['name']
 					]); ?>
-				<?php elseif($input['type'] === $module::TYPE_TEXT): ?>
+				<?php elseif ($input['type'] === $module::TYPE_TEXT): ?>
 					<?php echo template::text('formInput[' . $index . ']', [
 						'id' => 'formInput_' . $index,
 						'label' => $input['name']
 					]); ?>
-				<?php elseif($input['type'] === $module::TYPE_TEXTAREA): ?>
+				<?php elseif ($input['type'] === $module::TYPE_TEXTAREA): ?>
 					<?php echo template::textarea('formInput[' . $index . ']', [
 						'id' => 'formInput_' . $index,
 						'label' => $input['name']
 					]); ?>
-				<?php elseif($input['type'] === $module::TYPE_DATETIME): ?>
+				<?php elseif ($input['type'] === $module::TYPE_DATETIME): ?>
 					<?php echo template::date('formInput[' . $index . ']', [
 						'id' => 'formInput_' . $index,
 						'label' => $input['name'],
 						'vendor' => 'flatpickr'
 					]); ?>
-				<?php elseif($input['type'] === $module::TYPE_CHECKBOX): ?>
-					<?php echo template::checkbox('formInput[' . $index . ']', true, $input['name']
+				<?php elseif ($input['type'] === $module::TYPE_CHECKBOX): ?>
+					<?php echo template::checkbox(
+						'formInput[' . $index . ']',
+						true, $input['name']
 					); ?>
-				<?php elseif($input['type'] === $module::TYPE_LABEL): ?>
+				<?php elseif ($input['type'] === $module::TYPE_LABEL): ?>
 					<h3 class='formLabel'>
 						<?php echo $input['name']; ?>
 						<hr class="formLabel">
 					</h3>
 				<?php endif; ?>
 			<?php endforeach; ?>
-			<?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="col12 textAlignCenter">
 						<?php echo template::captcha('formCaptcha', [
-							'limit' => $this->getData(['config','connect', 'captchaStrong']),
-							'type' => $this->getData(['config','connect', 'captchaType'])
+							'limit' => $this->getData(['config', 'connect', 'captchaStrong']),
+							'type' => $this->getData(['config', 'connect', 'captchaType'])
 						]); ?>
 					</div>
 				</div>
@@ -68,8 +69,7 @@
 			</div>
 		</div>
 	</div>
-</div>
-<?php echo template::formClose(); ?>
+	<?php echo template::formClose(); ?>
 <?php else: ?>
 	<?php echo template::speech('Le formulaire ne contient aucun champ.'); ?>
 <?php endif; ?>
\ No newline at end of file