From d67abd9d8ca8876be051feb5f3e86174b0733298 Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Tue, 7 Mar 2006 12:39:15 +0000
Subject: [PATCH] =?utf8?q?D=C3=83=C2=A9sactive=20la=20recherche=20d'url=20?=
 =?utf8?q?dans=20les=20messages=20html=20=3D=3D>=20on=20suppose=20que=20l'?=
 =?utf8?q?=C3=83=C2=A9metteur=20a=20d=C3=83=C2=A9j=C3=83=C2=A0=20fait=20le?=
 =?utf8?q?=20boulot=20(sinon=20=C3=83=C2=A7a=20sert=20=C3=83=C2=A0=20quoi?=
 =?utf8?q?=20d'avoir=20post=C3=83=C2=A9=20en=20html=20=3F=3F=3F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 07076ea..8f33484 100644
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -374,18 +374,23 @@ function formatbody($_text, $format='plain', $flowed=false)
     if ($format == 'html') {
         $res = '<br/>'.html_entity_decode(to_entities(removeEvilTags($_text))).'<br/>';
     } else if ($format == 'richtext') {
-        $res = '<br/>'.createlinks(html_entity_decode(to_entities(richtextToHtml($_text)))).'<br/>';
-        $format = 'html';
+        $res = '<br/>'.html_entity_decode(to_entities(richtextToHtml($_text))).'<br/>';
     } else {
         $res  = "\n\n" . to_entities(wrap($_text, "", $flowed))."\n\n";
     }
 
-    global $banana;
-    $url  = $banana->url_regexp;
-    $res  = preg_replace("/(&lt;|&gt;|&quot;)/", " \\1 ", $res);
-    $res  = preg_replace("!$url!ie", "'\\1<a href=\"\\2\" title=\"\\2\">'.cutlink('\\2').'</a>\\3'", $res);
-    $res  = preg_replace('/(["\[])?(?:mailto:)?([a-z0-9.\-+_]+@[a-z0-9.\-+_]+)(["\]])?/i', '\1<a href="mailto:\2">\2</a>\3', $res);
-    $res  = preg_replace("/ (&lt;|&gt;|&quot;) /", "\\1", $res);
+    if ($format != 'html') {
+        global $banana;
+        $url  = $banana->url_regexp;
+        $res  = preg_replace("/(&lt;|&gt;|&quot;)/", " \\1 ", $res);
+        $res  = preg_replace("!$url!ie", "'\\1<a href=\"\\2\" title=\"\\2\">'.cutlink('\\2').'</a>\\3'", $res);
+        $res  = preg_replace('/(["\[])?(?:mailto:)?([a-z0-9.\-+_]+@[a-z0-9.\-+_]+)(["\]])?/i', '\1<a href="mailto:\2">\2</a>\3', $res);
+        $res  = preg_replace("/ (&lt;|&gt;|&quot;) /", "\\1", $res);
+
+        if ($format == 'richtext') {
+            $format = 'html';
+        }
+    }
  
     if ($format == 'html') {
         $res = preg_replace("@(</p>)\n?-- \n?(<p[^>]*>|<br[^>]*>)@", "\\1<br/>-- \\2", $res);
-- 
2.1.4