Rewritten banana spool structure for faster build and access

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

diff --git a/banana/message.inc.php b/banana/message.inc.php
index 02eeffc..efe8f7a 100644 (file)
--- a/banana/message.inc.php
+++ b/banana/message.inc.php
@@ -36,7 +36,7 @@ final class BananaMessage extends BananaMimePart
     {
         $msg = new BananaMessage();
         $msg->msg_headers = $headers;
-        $msg->makeTextPart($body, 'text/plain', '8bits', 'UTF-8', 'fixed');
+        $msg->makeTextPart($body, 'text/plain', '8bits', 'UTF-8', 'flowed');
         if (!is_null($file)) {
             $msg->addAttachment($file);
         }
@@ -87,7 +87,7 @@ final class BananaMessage extends BananaMimePart
             return substr($res,0, -2);
 
           case "from":
-            return BananaMessage::formatFrom($text);
+            return BananaMessage::formatFrom($text, $this->headers['subject']);
 
           case "references": case "in-reply-to":
             $rsl     = "";
@@ -119,7 +119,7 @@ final class BananaMessage extends BananaMimePart
     public function getSender()
     {
         $from = $this->headers['from'];
-        $name = trim(preg_replace('/<[^ ]*>/', '', $from));
+        $name = trim(strip_tags($from));
         if (empty($name)) {
             return $from;
         }
@@ -134,6 +134,8 @@ final class BananaMessage extends BananaMimePart
         }
         if ($hdr == 'date') {
             return strtotime($this->headers['date']);
+        } else if ($hdr == 'references' || $hdr == 'reply-to') {
+            return str_replace('><', '> <', $this->headers[$hdr]);
         } else {
             return $this->headers[$hdr];
         }
@@ -146,25 +148,28 @@ final class BananaMessage extends BananaMimePart
         return array_merge($headers, parent::getHeaders());
     }
 
-    static public function formatFrom($text)
+    static public function formatFrom($text, $subject = '')
     {
 #     From: mark@cbosgd.ATT.COM
 #     From: <mark@cbosgd.ATT.COM>
 #     From: mark@cbosgd.ATT.COM (Mark Horton)
 #     From: Mark Horton <mark@cbosgd.ATT.COM>
         $mailto = '<a href="mailto:';
-    
+
         $result = banana_htmlentities($text);
+        if ($subject) {
+           $subject = '?subject=' . banana_htmlentities(_b_('Re: ') . $subject, ENT_QUOTES);
+        }
         if (preg_match("/^<?([^< ]+@[^> ]+)>?$/", $text, $regs)) {
-            $result = $mailto . $regs[1] . '">' . banana_htmlentities($regs[1]) . '</a>';
+            $result = $mailto . $regs[1] . $subject . '">' . banana_htmlentities($regs[1]) . '</a>';
         }
         if (preg_match("/^([^ ]+@[^ ]+) \((.*)\)$/", $text, $regs)) {
-            $result = $mailto . $regs[1] . '">' . banana_htmlentities($regs[2]) . '</a>';
-        }   
+            $result = $mailto . $regs[1] . $subject . '">' . banana_htmlentities($regs[2]) . '</a>';
+        }
         if (preg_match("/^\"?([^<>\"]+)\"? +<(.+@.+)>$/", $text, $regs)) {
             $nom = preg_replace("/^'(.*)'$/", '\1', $regs[1]);
             $nom = stripslashes($nom);
-            $result = $mailto . $regs[2] . '">' . banana_htmlentities($nom) . '</a>';
+            $result = $mailto . $regs[2] . $subject . '">' . banana_htmlentities($nom) . '</a>';
         }
         return preg_replace("/\\\(\(|\))/","\\1",$result);
     }
@@ -175,7 +180,7 @@ final class BananaMessage extends BananaMimePart
         $name = null;
         if (preg_match("/^([^ ]+@[^ ]+) \((.*)\)$/", $text, $regs)) {
             $name = $regs[2];
-        }   
+        }
         if (preg_match("/^\"?([^<>\"]+)\"? +<(.+@.+)>$/", $text, $regs)) {
             $name = preg_replace("/^'(.*)'$/", '\1', $regs[1]);
             $name = stripslashes($name);
@@ -223,25 +228,28 @@ final class BananaMessage extends BananaMimePart
         return BananaMessage::formatReferences($this->headers);
     }
 
-    static public function formatReferences(array &$refs)
+    static public function &formatReferences(array &$refs)
     {
-        if (isset($refs['references'])) {
-            $text = str_replace('><', '> <', $refs['references']);
-            return preg_split('/\s/', strtr($text, Banana::$spool->ids));
-        } elseif (isset($refs['in-reply-to']) && isset(Banana::$spool->ids[$refs['in-reply-to']])) {
-            return array(Banana::$spool->ids[$refs['in-reply-to']]);
-        } else {
-            return array();
+        $references = array();
+        $msgs = Banana::$spool->getReferences($refs);
+        foreach ($msgs as &$msg) {
+            $references[] = $msg->id;
         }
+        return $references;
     }
 
     public function hasXFace()
     {
-        return Banana::$msgshow_xface && isset($this->headers['x-face']);
+        return Banana::$msgshow_xface && 
+               ((function_exists('hook_hasxface') && hook_hasXFace($this->headers))
+               || isset($this->headers['x-face']));
     }
 
     public function getXFace()
     {
+        if (function_exists('hook_getxface') && hook_getXFace($this->headers)) {
+            return;
+        }
         header('Content-Type: image/gif');
         $xface = $this->headers['x-face'];
         passthru('echo ' . escapeshellarg($xface)
@@ -292,13 +300,34 @@ final class BananaMessage extends BananaMimePart
         if (function_exists('hook_checkcancel')) {
             return hook_checkcancel($this->headers);
         }
-        return Banana::$profile['name'] == $this->headers['from'];
+        return Banana::$profile['headers']['From'] == $this->headers['from'];
     }
 
     public function canSend()
     {
         return Banana::$protocole->canSend();
     }
+
+    public function getSignature()
+    {
+        $email = $this->getHeaderValue('from');
+        if (preg_match('/<?([^ <]+@[^ >]+)>?/', $email, $matches)) {
+            $email = $matches[1];
+        }
+        $signature = BananaMimePart::getSignature();
+        if (empty($signature)) {
+            return $signature;
+        } else {
+            foreach ($signature['identity'] as $ident) {
+                if (strpos($ident, "<$email>") !== false) {
+                    return $signature;
+                }
+            }
+            $signature['certified'] = false;
+            $signature['certification_error'] = 'mauvaise identité';
+        }
+        return $signature;
+    }
 }
 
 // vim:set et sw=4 sts=4 ts=4 enc=utf-8: