From e5501c2076e7685bf1935b36c1a8a795e82cdba4 Mon Sep 17 00:00:00 2001
From: Yohann <yohann.danello@animath.fr>
Date: Fri, 24 Jan 2020 09:35:39 +0100
Subject: [PATCH] =?UTF-8?q?Les=20questions=20et=20r=C3=A9ponses=20ont=20ma?=
 =?UTF-8?q?intenant=20de=20vrais=20retours=20=C3=A0=20la=20ligne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server_files/views/ma_participation.php      | 5 ++---
 server_files/views/suivi_correspondances.php | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/server_files/views/ma_participation.php b/server_files/views/ma_participation.php
index f2c96ee..671cd69 100644
--- a/server_files/views/ma_participation.php
+++ b/server_files/views/ma_participation.php
@@ -97,8 +97,7 @@ if (false) {
 						continue;
 					?>
                     <div class="alert alert-info">
-                        <strong>Question <?= $question->getNumber() ?>
-                            :</strong> <?= $question->getQuestion() ?>
+                        <strong>Question <?= $question->getNumber() ?> :</strong> <?= preg_replace("#\n#", "<br />\n", $question->getQuestion()) ?>
                         <br/>
 						<?php
 						if ($question->getAttachedFile() !== null) { ?>
@@ -107,7 +106,7 @@ if (false) {
                             <br/>
 						<?php } ?>
                         <?php if (Phase::getCurrentPhase() >= Phase::PHASE4) { ?>
-                            <strong>Réponse :</strong> <?= $question->getAnswer() ?><br/>
+                            <strong>Réponse :</strong> <?= preg_replace("#\n#", "<br />\n", $question->getAnswer()) ?><br/>
                             <?php
                             if ($question->getAttachedFile() !== null) { ?>
                                 <em>Pièce jointe attachée :</em>
diff --git a/server_files/views/suivi_correspondances.php b/server_files/views/suivi_correspondances.php
index 8eae320..4b5104a 100644
--- a/server_files/views/suivi_correspondances.php
+++ b/server_files/views/suivi_correspondances.php
@@ -114,11 +114,11 @@ for ($problem = 1; $problem <= 4; ++$problem) { ?>
 								continue;
 
 							echo "<div class=\"alert alert-info\">\n";
-							echo "<strong>" . ($i == 0 ? "Remarques générales :" : "Question " . $i . " :") . "</strong> " . $question->getQuestion() . "<br />\n";
+							echo "<strong>" . ($i == 0 ? "Remarques générales :" : "Question " . $i . " :") . "</strong> " . preg_replace("#\n#", "<br />\n", $question->getQuestion()) . "<br />\n";
 							if ($question->getAttachedFile() != null)
 								echo "<em>Pièce jointe attachée :</em> <a href=\"/file/" . $question->getAttachedFile() . "\"><strong>Télécharger</strong></a><br />\n";
 							if ($question->getAnswer() != null)
-								echo "<strong>Réponse apportée :</strong> " . $question->getAnswer() . "<br />\n";
+								echo "<strong>Réponse apportée :</strong> " . preg_replace("#\n#", "<br />\n", $question->getAnswer()) . "<br />\n";
 							if ($question->getAttachedFileAnswer() != null)
 								echo "<em>Pièce jointe attachée pour la réponse :</em> <a href=\"/file/" . $question->getAttachedFileAnswer() . "\"><strong>Télécharger</strong></a><br />\n";
 							echo "</div>\n";