X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmisc.inc.php;h=f8df8709168cc9fe047e0d758ee8ae95ab49a44f;hb=76032c26b695305820448a33acd03e73cc502b41;hp=410ec7e68577f7c61f496da721e7e74cdb76e5bd;hpb=f5eb6c66d0e4e7878cd4b388bdfbb191ab709d70;p=banana.git

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 410ec7e..f8df870 100644
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -14,7 +14,7 @@
 function _b_($str) { return utf8_decode(dgettext('banana', utf8_encode($str))); }
 
 function to_entities($str) {
-    require_once 'banana/utf8.php';
+    require_once dirname(__FILE__).'/utf8.php';
     return utf8entities(htmlentities($str, ENT_NOQUOTES, 'UTF-8'));
 }
 
@@ -35,14 +35,15 @@ 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><em>';
+    $source = preg_replace('|</div>|i', '<br />', $source);
     $source = strip_tags($source, $allowedTags);
     return preg_replace('/<(.*?)>/ie', "'<'.removeEvilAttributes('\\1').'>'", $source);
 }
@@ -59,6 +60,55 @@ 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, '<div><br><p>')));
+    $res = preg_replace("@</?(br|p|div)[^>]*>@i", "\n", $res);
+    if (!is_utf8($res)) {
+        $res = utf8_encode($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
  */
@@ -223,10 +273,10 @@ function displayshortcuts($first = -1) {
         }
     } else {
         $res .= "[<a href=\"?group=$group&amp;artid=$artid&amp;action=new\">"
-            ._b_('Répondre')."</a>] ";
-        if ($banana->post->checkcancel()) {
+             ._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>';
@@ -258,19 +308,30 @@ function wrap($text, $_prefix="")
 function formatbody($_text, $format='plain')
 {
     if ($format == 'html') {
-        $res = '<br/>'.removeEvilTags(html_entity_decode(to_entities($_text))).'<br/>';
+        $res = '<br/>'.html_entity_decode(to_entities(removeEvilTags($_text))).'<br/>';
+    } else if ($format == 'richtext') {
+        $res = '<br/>'.html_entity_decode(to_entities(richtextToHtml($_text))).'<br/>';
+        $format = 'html';
     } else {
         $res  = "\n\n" . to_entities(wrap($_text, ""))."\n\n";
     }
     $res  = preg_replace("/(&lt;|&gt;|&quot;)/", " \\1 ", $res);
-    $res  = preg_replace('/(["\[])?((https?|ftp|news):\/\/[a-z@0-9.~%$£µ&i#\-+=_\/\?]*)(["\]])?/i', "\\1<a href=\"\\2\">\\2</a>\\4", $res);
+    $res  = preg_replace('/(["\[])?((https?|ftp|news):\/\/[a-z@0-9.~%$£µ&i#\-+=_\/\?]*)(["\]])?/i', '\1<a href="\2">\2</a>\4', $res);
     $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 {
+        for ($i = 1 ; preg_match("@(^|<pre>|\n)&gt;@i", $res) ; $i++) {
+            $res  = preg_replace("@(^|<pre>|\n)((&gt;[^\n]*\n)+)@ie",
+                "'\\1</pre><blockquote class=\'level$i\'><pre>'"
+    		    .".stripslashes(preg_replace('@(^|<pre>|\n)&gt;[ \\t\\r]*@i', '\\1', '\\2'))"
+	    	    .".'</pre></blockquote><pre>'",
+	            $res);
+        }
+	$res = preg_replace("@<pre>-- ?\n@", "<pre>\n-- \n", $res);
         $parts = preg_split("/\n-- ?\n/", $res);
     }
 
@@ -278,7 +339,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;