X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmessage.inc.php;h=17fcf5c85ab2c83e42025a6ad9b2dead45ef48bd;hb=fd57a15cace088016b5eb49f87fb972a51a1c400;hp=c83d17bc893507cfcc886eb731aa6e6325df5cd9;hpb=7027794fb616f65d8910305c9fed9037a751b875;p=banana.git

diff --git a/banana/message.inc.php b/banana/message.inc.php
index c83d17b..17fcf5c 100644
--- a/banana/message.inc.php
+++ b/banana/message.inc.php
@@ -22,7 +22,7 @@ final class BananaMessage extends BananaMimePart
             if (isset($this->headers['in-reply-to']) && isset($this->headers['references'])) {
                 unset($this->headers['in-reply-to']);
             }
-            Banana::$show_hdr = array_intersect(Banana::$show_hdr, array_keys($this->headers));
+            Banana::$msgshow_headers = array_intersect(Banana::$msgshow_headers, array_keys($this->headers));
             Banana::$message =& $this;
         }
     }
@@ -49,15 +49,15 @@ final class BananaMessage extends BananaMimePart
           case 'from':          return _b_('De');
           case 'subject':       return _b_('Sujet');
           case 'newsgroups':    return _b_('Forums');
-          case 'followup-to':   return _b_('Suivi à');
-          case 'to':            return _b_('À');
-          case 'cc':            return _b_('Copie à');
-          case 'bcc':           return _b_('Copie cachée à');
-          case 'reply-to':      return _b_('Répondre à');
+          case 'followup-to':   return _b_('Suivi à');
+          case 'to':            return _b_('À');
+          case 'cc':            return _b_('Copie à');
+          case 'bcc':           return _b_('Copie cachée à');
+          case 'reply-to':      return _b_('Répondre à');
           case 'date':          return _b_('Date');
           case 'organization':  return _b_('Organisation');
           case 'in-reply-to':
-          case 'references':    return _b_('Références');
+          case 'references':    return _b_('Références');
           case 'x-face':        return _b_('Image');
         }
         return $hdr;
@@ -107,12 +107,8 @@ final class BananaMessage extends BananaMimePart
             return $rsl;
 
           case "subject":
-            $link = null;
             $text = stripslashes($text);
-            if (function_exists('hook_getSubject')) {
-                $link = hook_getSubject($text);
-            }
-            return banana_catchFormats($text) . $link;
+            return banana_catchFormats($text);
 
           default:
             return $text;
@@ -144,7 +140,7 @@ final class BananaMessage extends BananaMimePart
 
     public function getHeaders()
     {
-        $this->msg_headers = array_merge($this->msg_headers, Banana::$custom_hdr, Banana::$profile['custom_hdr']);
+        $this->msg_headers = array_merge($this->msg_headers, Banana::$msgedit_headers, Banana::$profile['headers']);
         $headers = array_map(array($this, 'encodeHeader'), $this->msg_headers);
         return array_merge($headers, parent::getHeaders());
     }
@@ -218,7 +214,7 @@ final class BananaMessage extends BananaMimePart
 
     public function hasXFace()
     {
-        return Banana::$formatxface && isset($this->headers['x-face']);
+        return Banana::$msgshow_xface && isset($this->headers['x-face']);
     }
 
     public function getXFace()
@@ -233,7 +229,7 @@ final class BananaMessage extends BananaMimePart
 
     public function getFormattedBody($type = null)
     {
-        $types = Banana::$body_mime;
+        $types = Banana::$msgshow_mimeparts;
         if (!is_null($type)) {
             array_unshift($types, $type);
         }
@@ -243,25 +239,25 @@ final class BananaMessage extends BananaMimePart
             if (empty($parts)) {
                 continue;
             }
-            foreach ($parts as &$part) {
-                list($type, $subtype) = $part->getType();
-                switch ($subtype) {
-                  case 'html': return banana_formatHtml($part);
-                  case 'enriched': case 'richtext': return banana_formatRichText($part);
-                  default: return banana_formatPlainText($part);
-                }
-            }
+            return $parts[0]->toHtml();
         }
         return null;
     }
 
     public function quote()
     {
-        $part = $this->toPlainText();
-        if (is_null($part)) {
-            return banana_quoteHtml($this->toHtml());
+        foreach (Banana::$msgedit_mimeparts as $type) {
+            @list($type, $subtype) = explode('/', $type);
+            $parts = $this->getParts($type, $subtype);
+            if (empty($parts)) {
+                continue;
+            }
+            if ($parts[0] === $this) {
+                return parent::quote();
+            }
+            return $parts[0]->quote();
         }
-        return banana_quotePlainText($part);
+        return null;
     }
 
     public function canCancel()
@@ -281,5 +277,5 @@ final class BananaMessage extends BananaMimePart
     }
 }
 
-// vim:set et sw=4 sts=4 ts=4:
+// vim:set et sw=4 sts=4 ts=4 enc=utf-8:
 ?>