From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Tue, 28 Feb 2006 12:29:38 +0000 (+0000)
Subject: Séparation de la signature du corps pour les messages html pas trop complexe.
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1110246140290ef0ae49d1b39e23d2cb72e1192d;p=banana.git

Séparation de la signature du corps pour les messages html pas trop complexe.
Devrait fonctionner correctement pour des cas de la forme :
<br>-- <br>
<p>-- </p>
</p>-- <p>
<br>-- <p>
</p>-- <br>


git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@7 9869982d-c50d-0410-be91-f2a2ec7c7c7b
---

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index d90ba56..410ec7e 100644
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -267,14 +267,23 @@ function formatbody($_text, $format='plain')
     $res  = preg_replace("/ (&lt;|&gt;|&quot;) /", "\\1", $res);
 
     if ($format == 'html') {
-        return $res;
+        $res = preg_replace("@(</p>)\n?-- \n?(<p[^>]*>|<br>)@", "\\1<br>-- \\2", $res);
+        $res = preg_replace("@<br>\n?-- \n?(<p[^>]*>)@", "<br>-- <br>\\2", $res);
+        $parts = preg_split("@(:?<p[^>]*>\n?-- \n?</p>|<br[^>]*>\n?-- \n?<br>)@", $res);
+    } else {
+        $parts = preg_split("/\n-- ?\n/", $res);
     }
 
-    $parts = preg_split("/\n-- ?\n/", $res);
-
     if (count($parts) > 1) {
-        $sign = "</pre><hr style='width: 100%; margin: 1em 0em; ' /><pre>" . array_pop($parts);
-        return join("\n-- \n", $parts).$sign;
+        $sign  = array_pop($parts);
+        if ($format == 'html') {
+            $res  = join('<br/>-- <br/>', $parts);
+            $sign = '<hr style="width: 100%; margin: 1em 0em; " />'.$sign;
+        } else {
+            $res  = join('\n-- \n', $parts);
+            $sign = '</pre><hr style="width: 100%; margin: 1em 0em; " /><pre>'.$sign;
+        }
+        return $res.$sign;
     } else {
         return $res;
     }