Ajoute le support du 'richtext'... avec un jeu de balise relativement réduit

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

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index a1de491..9989956 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -59,6 +59,7 @@ class Banana
     function run($class = 'Banana')
     {
         global $banana;
+
         Banana::_require('misc');
         $banana = new $class();
 

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 15997aa..1197c69 100644 (file)
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -35,14 +35,14 @@ function textFormat_translate($format)
  * Taken from php.net
  */
 
- /**
+/**
  * @return string
  * @param string
  * @desc Strip forbidden tags and delegate tag-source check to removeEvilAttributes()
  */
 function removeEvilTags($source)
 {
-    $allowedTags = '<h1><b><i><a><ul><li><pre><hr><blockquote><img><br><font><p>';
+    $allowedTags = '<h1><b><i><a><ul><li><pre><hr><blockquote><img><br><font><p><small><big><sup><sub><code>';
     $source = strip_tags($source, $allowedTags);
     return preg_replace('/<(.*?)>/ie', "'<'.removeEvilAttributes('\\1').'>'", $source);
 }
@@ -59,6 +59,52 @@ function removeEvilAttributes($tagSource)
     return stripslashes(preg_replace("/$stripAttrib/i", '', $tagSource));
 }
 
+/** Convert html to plain text
+ */
+function htmlToPlainText($res)
+{
+    $res = trim(html_entity_decode(strip_tags($res, '<br>')));
+    $res = preg_replace("@<br[^>]>@i", "\n", $res);
+    return $res;
+}
+
+/********************************************************************************
+ * RICHTEXT STUFF
+ */
+
+/** Convert richtext to html
+ */
+function richtextToHtml($source)
+{
+    $tags = Array('bold' => 'b',
+                  'italic' => 'i',
+                  'smaller' => 'small',
+                  'bigger' => 'big',
+                  'underline' => 'u',
+                  'subscript' => 'sub',
+                  'superscript' => 'sup',
+                  'excerpt' => 'blockquote',
+                  'paragraph' => 'p',
+                  'nl' => 'br'
+            );
+            
+    // clean unsupported tags
+    $protectedTags = '<signature><lt><comment><'.join('><', array_keys($tags)).'>';
+    $source = strip_tags($source, $protectedTags);
+    
+    // convert richtext tags to html
+    foreach (array_keys($tags) as $tag) {
+        $source = preg_replace('@(</?)'.$tag.'([^>]*>)@i', '\1'.$tags[$tag].'\2', $source);
+    }
+
+    // some special cases
+    $source = preg_replace('@<signature>@i', '<br>-- <br>', $source);
+    $source = preg_replace('@</signature>@i', '', $source);
+    $source = preg_replace('@<lt>@i', '&lt;', $source);
+    $source = preg_replace('@<comment[^>]*>((?:[^<]|<(?!/comment>))*)</comment>@i', '<!-- \1 -->', $source);
+    return removeEvilAttributes($source);
+}
+
 /********************************************************************************
  *  HEADER STUFF
  */
@@ -259,6 +305,9 @@ function formatbody($_text, $format='plain')
 {
     if ($format == 'html') {
         $res = '<br/>'.removeEvilTags(html_entity_decode(to_entities($_text))).'<br/>';
+    } else if ($format == 'richtext') {
+        $res = '<br/>'.richtextToHtml(html_entity_decode(to_entities($_text))).'<br/>';
+        $format = 'html';
     } else {
         $res  = "\n\n" . to_entities(wrap($_text, ""))."\n\n";
     }

diff --git a/banana/post.inc.php b/banana/post.inc.php
index df64f27..a1cb4d4 100644 (file)
--- a/banana/post.inc.php
+++ b/banana/post.inc.php
@@ -149,13 +149,11 @@ class BananaPost
         if ($format[1] == 'plain') {
             return $this->body;
         }
-        $res = preg_replace("@<br[^>]>@", "@@@#@", $this->body);
-        $res = trim(html_entity_decode(strip_tags($res)));
-        $res = str_replace("@@@#@", "\n", $res);
-        if (!is_utf8($res)) {
-            $res = utf8_encode($res);
+        if ($format[1] == 'richtext') {
+            return htmlToPlainText(richtextToHtml($this->body));
+        } else {
+            return htmlToPlainText($this->body);
         }
-        return $res;
     }
 
     /** decode an attachment