Add a space after quote marks.

[banana.git] / banana / message.func.inc.php

diff --git a/banana/message.func.inc.php b/banana/message.func.inc.php
index 31f3e47..9a59103 100644 (file)
--- a/banana/message.func.inc.php
+++ b/banana/message.func.inc.php
@@ -41,7 +41,7 @@ function banana_quote($line, $level, $mark = '>')
     $lines = explode("\n", $line);
     $quote = str_repeat($mark, $level);
     foreach ($lines as &$line) {
-        $line = $quote . $line;
+        $line = $quote . ' ' . $line;
     }
     return implode("\n", $lines);
 }
@@ -88,13 +88,16 @@ function banana_catchFormats($text)
                         'strong' => array('\B\*\b', '\b\*\B'));
     $url = Banana::$msgshow_url;
     preg_match_all("/$url/ui", $text, $urls);
-    $text = str_replace($urls[0], "&&&urls&&&", $text);
+    $urls = $urls[0];
+    $replace = $urls;
+    rsort($replace);
+    $text = str_replace($replace, "&&&urls&&&", $text);
     foreach ($formatting as $mark=>$limit) {
         list($ll, $lr) = $limit;
         $text = preg_replace('/' . $ll . '(\w+?)' . $lr . '/us',
                              "<$mark>\\1</$mark>", $text);
     }
-    return preg_replace('/&&&urls&&&/e', 'array_shift($urls[0])', $text);
+    return preg_replace('/&&&urls&&&/e', 'array_shift($urls)', $text);
 }
 
 /** Build a flowed text from plain text
@@ -220,7 +223,7 @@ function banana_wrap($text, $base_level = 0, $strict = true)
             if (!empty($buffer)) {
                 $text  .= banana_wordwrap(implode("\n", $buffer), $level + $base_level) . "\n";
                 $buffer = array();
-            }    
+            }
             $level  = $lvl;
         }
         $buffer[] = $line;
@@ -231,17 +234,21 @@ function banana_wrap($text, $base_level = 0, $strict = true)
     return $text;
 }
 
-function banana_formatPlainText(BananaMimePart &$part, $base_level = 0)
+function banana_formatPlainText(BananaMimePart $part, $base_level = 0)
 {
     $text = $part->getText();
     if ($part->isFlowed()) {
         $text = banana_unflowed($text);
     }
-    $text = banana_wrap($text, $base_level, $part->isFlowed());
-    return banana_plainTextToHtml($text, $part->isFlowed());
+    if (function_exists('hook_formatPart') && ($ret = hook_formatPart($text, $part, $base_level))) {
+        return $ret;
+    } else {
+        $text = banana_wrap($text, $base_level, $part->isFlowed());
+        return banana_plainTextToHtml($text, $part->isFlowed());
+    }
 }
 
-function banana_quotePlainText(BananaMimePart &$part)
+function banana_quotePlainText(BananaMimePart $part)
 {
     $text = $part->getText();
     if ($part->isFlowed()) {
@@ -347,7 +354,7 @@ function banana_filterCss($css)
     }
     return $css;
 }
-    
+
 /**
  * @return string
  * @param string
@@ -359,7 +366,7 @@ function banana_cleanHtml($source, $to_xhtml = false)
         $tidy_config = array('drop-empty-paras' => true,
                              'drop-proprietary-attributes' => true,
                              'hide-comments' => true,
-                             'logical-emphasis' => true, 
+                             'logical-emphasis' => true,
                              'output-xhtml' => true,
                              'replace-color' => true,
                              'join-classes'  => false,
@@ -407,7 +414,7 @@ function banana_cleanHtml($source, $to_xhtml = false)
     // Use inlined style instead of old html attributes
     if ($to_xhtml) {
         $source = preg_replace('/<(\/?\w+)(.*?)(\/?>)/muise', "'<\\1' . banana_cleanStyles('\\1', '\\2') . '\\3'", $source);
-    }    
+    }
     return preg_replace('/<(.*?)>/ie', "'<'.banana_removeEvilAttributes('\\1').'>'", $source);
 }
 
@@ -482,21 +489,21 @@ function banana_htmlToPlainText($res)
     $res = trim(strip_tags($res, '<div><br><p><blockquote>'));
     $res = preg_replace("@</?(br|p|div).*?>@si", "\n", $res);
     $res = banana__convertQuotes($res);
-    return banana_html_entity_decode($res);    
+    return banana_html_entity_decode($res);
 }
 
-function banana_formatHtml(BananaMimePart &$part)
+function banana_formatHtml(BananaMimePart $part)
 {
     $text = $part->getText();
     $text = banana_catchHtmlSignature($text);
     if (!Banana::$msgshow_externalimages) {
         $text = banana_hideExternalImages($text);
-    }    
+    }
     $text = banana_catchPartLinks($text);
     return banana_cleanHtml($text, true);
 }
 
-function banana_quoteHtml(BananaMimePart &$part)
+function banana_quoteHtml(BananaMimePart $part)
 {
     $text = $part->getText();
     $text = banana_htmlToPlainText($text);
@@ -539,7 +546,7 @@ function banana_richtextToHtml($source)
     return banana_cleanHtml($source);
 }
 
-function banana_formatRichText(BananaMimePart &$part)
+function banana_formatRichText(BananaMimePart $part)
 {
     $text = $part->getText();
     $text = banana_richtextToHtml($text);
@@ -547,7 +554,7 @@ function banana_formatRichText(BananaMimePart &$part)
     return banana_cleanHtml($text);
 }
 
-function banana_quoteRichtText(BananaMimePart &$part)
+function banana_quoteRichtText(BananaMimePart $part)
 {
     $text = $part->getText();
     $text = banana_richtextToHtml($text);