From f5eb6c66d0e4e7878cd4b388bdfbb191ab709d70 Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Tue, 28 Feb 2006 12:29:38 +0000
Subject: [PATCH] =?utf8?q?=3D=3Futf-8=3Fq=3FS=3DC3=3D83=3DC2=3DA9paration?=
 =?utf8?q?=3D20de=3D20la=3D20signature=3D20du=3D20corps=3D20pour=3D20les?=
 =?utf8?q?=3D20messages=3D20html=3D20pas=3D20trop=3D20complexe.?=

=20<br>--=20<br>
=20<p>--=20</p>
=20</p>--=20<p>
=20<br>--=20<p>
=20</p>--=20<br>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@7 9869982d-c50d-0410-be91-f2a2ec7c7c7b
---
 banana/misc.inc.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

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;
     }
-- 
2.1.4