From 73afa785171a842618bc82d1c5d9e4b7436b475b Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Fri, 3 Mar 2006 20:49:37 +0000
Subject: [PATCH] =?utf8?q?Affiche=20les=20citations=20de=20messages=20ant?=
 =?utf8?q?=C3=83=C2=A9rieurs=20=C3=83=C2=A0=20l'aide=20de=20blockquotes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@25 9869982d-c50d-0410-be91-f2a2ec7c7c7b
---
 banana/misc.inc.php | 18 ++++++++++++------
 css/style.css       |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 7520adf..a559e92 100644
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -272,10 +272,10 @@ function displayshortcuts($first = -1) {
         }
     } else {
         $res .= "[<a href=\"?group=$group&amp;artid=$artid&amp;action=new\">"
-            ._b_('Répondre')."</a>] ";
+             ._b_('Répondre')."</a>] ";
         if ($banana->post && $banana->post->checkcancel()) {
             $res .= "[<a href=\"?group=$group&amp;artid=$artid&amp;action=cancel\">"
-                ._b_('Annuler ce message')."</a>] ";
+                 ._b_('Annuler ce message')."</a>] ";
         }
     }
     return $res.'</div>';
@@ -319,10 +319,16 @@ function formatbody($_text, $format='plain')
     $res  = preg_replace("/ (&lt;|&gt;|&quot;) /", "\\1", $res);
 
     if ($format == 'html') {
-        $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);
+        $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 {
+        while (preg_match("@(^|<blockquote[^>]*>|\n)&gt;@i", $res)) {
+            $res  = preg_replace("@(^|<blockquote[^>]*>|\n)((&gt;[^\n]*\n)+)@ie",
+            "'\\1<blockquote type=\'cite\'>'.preg_replace('@(^|<blockquote[^>]*>|\n)&gt;[ \\t\\r]*@i', '\\1', '\\2').'</blockquote>'",
+                    $res);
+        }
+        $res = preg_replace("@(<blockquote[^>]*>)\n@", '\1', $res);
         $parts = preg_split("/\n-- ?\n/", $res);
     }
 
@@ -330,7 +336,7 @@ function formatbody($_text, $format='plain')
         $sign  = array_pop($parts);
         if ($format == 'html') {
             $res  = join('<br/>-- <br/>', $parts);
-            $sign = '<hr style="width: 100%; margin: 1em 0em; " />'.$sign;
+            $sign = '<hr style="width: 100%; margin: 1em 0em; " />'.$sign.'<br/>';
         } else {
             $res  = join('\n-- \n', $parts);
             $sign = '</pre><hr style="width: 100%; margin: 1em 0em; " /><pre>'.$sign;
diff --git a/css/style.css b/css/style.css
index 825a890..fe1d341 100644
--- a/css/style.css
+++ b/css/style.css
@@ -39,3 +39,4 @@ table.banana_msg table { border: 0px; padding: 0px; margin: 0px; width: 100%; }
 
 div.center { text-align: center; padding: 1em; }
 p.error { color: red; background: inherit; }
+
-- 
2.1.4