Fix NNTP posting (double points on line beginning)

[banana.git] / banana / mimepart.inc.php

diff --git a/banana/mimepart.inc.php b/banana/mimepart.inc.php
index d90a22b..26cb31a 100644 (file)
--- a/banana/mimepart.inc.php
+++ b/banana/mimepart.inc.php
@@ -388,8 +388,13 @@ class BananaMimePart
         $content = "";
         if ($with_headers) {
             foreach ($this->getHeaders() as $key => $value) {
-                $content .= "$key: $value\n"; 
-            }   
+                $line = "$key: $value"; 
+                $line = explode("\n", wordwrap($line, Banana::$msgshow_wrap));
+                for ($i = 1 ; $i < count($line) ; $i++) {
+                    $line[$i] = "\t" . $line[$i];
+                }
+                $content .= implode("\n", $line) . "\n";
+            } 
             $content .= "\n";
         } 
         if ($this->isType('multipart')) {
@@ -399,20 +404,83 @@ class BananaMimePart
             }
             $content .= "\n--{$this->boundary}--";
         } else {
-            $content .= $this->body;
+            $content .= banana_wordwrap($this->body);
         }
         return $content;
     }
 
     public function getText()
     {
-        if (!$this->isType('text')) {
-            return null;
-        }
         $this->decodeContent();
         return $this->body;
     }
 
+    public function toHtml()
+    {
+        list($type, $subtype) = $this->getType();
+        if ($type == 'image') {
+            $part = $this->id ? $this->id : $this->filename;
+            return '<img src="'
+                 . banana_htmlentities(Banana::$page->makeUrl(array('group' => Banana::$group,
+                                                                    'artid' => Banana::$artid,
+                                                                    'part'  => $part)))
+                 . '" alt="' . banana_htmlentities($this->filename) . '" />';
+        } elseif (!in_array($type, Banana::$msgshow_mimeparts)
+                  && !in_array($this->content_type, Banana::$msgshow_mimeparts)) {
+            $part = $this->id ? $this->id : $this->filename;
+            if (!$part) {
+                $part = $this->content_type;
+            }
+            return '[' . Banana::$page->makeImgLink(array('group' => Banana::$group,
+                                                 'artid' => Banana::$artid,
+                                                 'part'  => $part,
+                                                 'text'  => $this->filename ? $this->filename : $this->content_type,
+                                                 'img'   => 'save')) . ']';
+        } else {
+            if ($type == 'multipart' && ($subtype == 'mixed' || $subtype == 'report')) {
+                $text = '';
+                foreach ($this->multipart as &$part) {
+                    $text .= $part->toHtml();
+                }
+                return $text;
+            }
+            switch ($subtype) {
+              case 'html': return banana_formatHtml($this);
+              case 'enriched': case 'richtext': return banana_formatRichText($this);
+              default:
+                if ($type == 'message') {
+                    return '<hr />' . banana_formatPlainText($this);
+                }
+                return banana_formatPlainText($this);
+            }
+        }
+        return null;
+    }
+
+    public function quote()
+    {
+        list($type, $subtype) = $this->getType();
+        if (in_array($type, Banana::$msgedit_mimeparts) || in_array($this->content_type, Banana::$msgedit_mimeparts)) {
+            if ($type == 'multipart' && ($subtype == 'mixed' || $subtype == 'report')) {
+                $text = '';
+                foreach ($this->multipart as &$part) {
+                    $qt = $part->quote();
+                    $qt = rtrim($qt);
+                    if (!empty($text)) {
+                        $text .= "\n" . banana_quote("", 1) . "\n";
+                    }
+                    $text .= $qt;
+                }
+                return $text;
+            }
+            switch ($subtype) {
+              case 'html': return banana_quoteHtml($this);
+              case 'enriched': case 'richtext': return banana_quoteRichText($this);
+              default: return banana_quotePlainText($this);
+            }
+        }
+    }
+
     protected function getType()
     {
         return explode('/', $this->content_type);
@@ -447,24 +515,6 @@ class BananaMimePart
         return $parts;
     }
 
-    public function toPlainText()
-    {
-        $parts = $this->getParts('text', 'plain');
-        return (count($parts) ? $parts[0] : null);
-    }
-
-    public function toHtml()
-    {
-        $parts = $this->getParts('text', 'html');
-        return (count($parts) ? $parts[0] : null);
-    }
-
-    public function toRichText()
-    {
-        $parts = $this->getParts('text', 'enriched');
-        return (count($parts) ? $parts[0] : null);
-    }
-
     public function getFile($filename)
     {
         if ($this->filename == $filename) {
@@ -510,5 +560,5 @@ class BananaMimePart
     }
 }
 
-// vim:set et sw=4 sts=4 ts=4:
+// vim:set et sw=4 sts=4 ts=4 enc=utf-8:
 ?>