X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fpost.inc.php;h=df64f2715200fa46fff1e5f1fafbe2d4531a802c;hb=39816f8b637dbd80dc1a64f1a04adb4f3cf24a9f;hp=364c1228ca5cbf15e879cf6670c44b57e4009efc;hpb=7a0e2710704d196dc470cdc9d6a4b130fbf3b2e0;p=banana.git

diff --git a/banana/post.inc.php b/banana/post.inc.php
index 364c122..df64f27 100644
--- a/banana/post.inc.php
+++ b/banana/post.inc.php
@@ -17,6 +17,8 @@ class BananaPost
     var $headers;
     /** body */
     var $body;
+    /** formating */
+    var $messages;
     /** attachment */
     var $pj;
     /** poster name */
@@ -28,8 +30,9 @@ class BananaPost
     function BananaPost($_id)
     {
         global $banana;
-        $this->id = $_id;
-        $this->pj = array();
+        $this->id       = $_id;
+        $this->pj       = array();
+        $this->messages = array();
         $this->_header();
 
         if ($body = $banana->nntp->body($_id)) {
@@ -48,13 +51,13 @@ class BananaPost
 
         if (preg_match("@multipart/([^;]+);@", $this->headers['content-type'], $mpart_type)) {
             preg_match("/boundary=\"?([^ \"]+)\"?/", $this->headers['content-type'], $mpart_boundary);
-            $this->split_multipart($mpart_type[1], $mpart_boundary[1]);
-        }
-        
-        if (preg_match('!charset=([^;]*)\s*(;|$)!', $this->headers['content-type'], $matches)) {
-            $this->body = iconv($matches[1], 'utf-8', $this->body);
+            $this->_split_multipart($mpart_type[1], $mpart_boundary[1]);
         } else {
-            $this->body = utf8_encode($this->body);
+            if (preg_match('!charset=([^;]*)\s*(;|$)!', $this->headers['content-type'], $matches)) {
+                $this->body = iconv($matches[1], 'utf-8', $this->body);
+            } else {
+                $this->body = utf8_encode($this->body);
+            }
         }
     }
 
@@ -62,32 +65,27 @@ class BananaPost
      * @param $type STRING multipart type description
      * @param $boundary STRING multipart boundary identification string
      */
-    function split_multipart($type, $boundary)
+    function _split_multipart($type, $boundary)
     {
-        global $banana;
-        
         $parts = preg_split("/\n--$boundary(--|\n)/", $this->body);
         foreach ($parts as $part) {
-            $part = $this->get_part($part);
+            $part = $this->_get_part($part);
             $local_header = $part['headers'];
             $local_body = $part['body'];
             if (isset($local_header['content-disposition']) && preg_match("/attachment/", $local_header['content-disposition'])) {
-                $this->add_attachment($part);
-            } else if (isset($local_header['content-type']) && preg_match("@text/@", $local_header['content-type'])) {
-                $this->body = $local_body;
-                foreach ($banana->parse_hdr as $hdr) {
-                    if (isset($local_header[$hdr])) {
-                        $this->headers[$hdr] = $local_header[$hdr];
-                    }
-                }
+                $this->_add_attachment($part);
+            } else if (isset($local_header['content-type']) && preg_match("@text/([^;]+);@", $local_header['content-type'], $format)) {
+    	        array_push($this->messages, $part);
             }
         }
+        $this->set_body_to_part(0);
     }
 
     /** extract new headers from the part
      * @param $part STRING part of a multipart message
      */
-    function get_part($part) {
+    function _get_part($part)
+    {
         global $banana;
 
         $lines = split("\n", $part);
@@ -103,16 +101,18 @@ class BananaPost
                 break;
             }
         }
-        #        echo join("\n", $lines)."<br/>------------------------------------<br/>";
         return Array('headers' => $local_headers, 'body' => join("\n", $lines)); 
     }
 
-    function add_attachment($part) {
+    /** add an attachment
+     */
+    function _add_attachment($part)
+    {
         $local_header = $part['headers'];
         $local_body = $part['body'];
 
         if (!isset($local_header['content-transfer-encoding'])) {
-            return;
+            return false;
         }
 
         if (isset($local_header['content-disposition'])) {
@@ -131,28 +131,49 @@ class BananaPost
             }
         }
         if (!isset($mimetype)) {
-            return;
+            return false;
         }
 
         array_push($this->pj, Array('MIME' => $mimetype,
                                     'filename' => $filename,
                                     'encoding' => strtolower($local_header['content-transfer-encoding']),
                                     'data' => $local_body));
+        return true;
+    }
+
+    /** return body in plain text (useful for messages without a text/plain part)
+     */
+    function get_body()
+    {
+        preg_match("@text/([^;]+);@", $this->headers['content-type'], $format);
+        if ($format[1] == 'plain') {
+            return $this->body;
+        }
+        $res = preg_replace("@<br[^>]>@", "@@@#@", $this->body);
+        $res = trim(html_entity_decode(strip_tags($res)));
+        $res = str_replace("@@@#@", "\n", $res);
+        if (!is_utf8($res)) {
+            $res = utf8_encode($res);
+        }
+        return $res;
     }
 
     /** decode an attachment
      * @param pjid INT id of the attachment to decode
      * @param action BOOL action to execute : true=view, false=download
      */
-    function get_attachment($pjid, $action = false) {
+    function get_attachment($pjid, $action = false)
+    {
         if ($pjid >= count($this->pj)) {
             return false;
         } else {
             $file = $this->pj[$pjid];
-            header('Content-Type: '.$file['MIME']);
+            header('Content-Type: '.$file['MIME'].'; name="'.$file['filename'].'"');
             if (!$action) {
                 header('Content-Disposition: attachment; filename="'.$file['filename'].'"');
-            }
+            } else {
+                header('Content-Disposition: inline; filename="'.$file['filename'].'"');
+            }                
             if ($file['encoding'] == 'base64') {
                 echo base64_decode($file['data']);
             } else {
@@ -163,6 +184,33 @@ class BananaPost
         }
     }
 
+    /** set body to represent the given part
+     * @param partid INT index of the part in messages
+     */
+    function set_body_to_part($partid)
+    {
+        global $banana;
+        
+        if (count($this->messages) == 0) {
+            return false;
+        }
+
+        $local_header = $this->messages[$partid]['headers'];
+        $this->body   = $this->messages[$partid]['body'];
+        foreach ($banana->parse_hdr as $hdr) {
+            if (isset($local_header[$hdr])) {
+                $this->headers[$hdr] = $local_header[$hdr];
+            }
+        }
+
+        if (preg_match('!charset=([^;]*)\s*(;|$)!', $this->headers['content-type'], $matches)) {
+            $this->body = iconv($matches[1], 'utf-8', $this->body);
+        } else {
+            $this->body = utf8_encode($this->body);
+        }                                                        
+        return true;
+    }
+
     function _header()
     {
         global $banana;
@@ -207,10 +255,38 @@ class BananaPost
         return ($this->headers['from'] == $_SESSION['name']." <".$_SESSION['mail'].">");
     }
 
-    function to_html()
+    /** convert message to html
+     * @param partid INT id of the multipart message that must be displaid
+     */
+    function to_html($partid = -1)
     {
         global $banana;
 
+        if (count($this->messages) > 1) {
+            if ($partid != -1) {
+                $this->set_body_to_part($partid);
+            } else {
+                // Select prefered text-format
+                foreach ($banana->body_mime as $mime) {
+                    for ($id = 0 ; $id < count($this->messages) ; $id++) {
+                        if (preg_match("@$mime@", $this->messages[$id]['headers']['content-type'])) {
+                            $partid = $id;
+                            $this->set_body_to_part($partid);
+                            break;
+                        }
+                    }
+                    if ($partid != -1) {
+                        break;
+                    }
+                }
+                if ($partid == -1) {
+                    $partid = 0;
+                }
+            }
+        } else {
+            $partid = 0;
+        }
+
         $res  = '<table class="bicol banana_msg" cellpadding="0" cellspacing="0">';
         $res .= '<tr><th colspan="2">'._b_('En-têtes').'</th></tr>';
 
@@ -223,8 +299,34 @@ class BananaPost
             }
         }
 
-        $res .= '<tr><th colspan="2">'._b_('Corps').'</th></tr>';
-        $res .= '<tr><td colspan="2"><pre>'.formatbody($this->body).'</pre></td></tr>';
+        $res .= '<tr><th colspan="2">'._b_('Corps');
+        if (count($this->messages) > 1) {
+            for ($i = 0 ; $i < count($this->messages) ; $i++) {
+                if ($i == 0) {
+                    $res .= ' : ';
+                } else {
+                    $res .= ' . ';
+                }
+                preg_match("@text/([^;]+);@", $this->messages[$i]['headers']['content-type'], $format);
+                $format = textFormat_translate($format[1]);
+                if ($i != $partid) {
+                    $res .= '<a href="?group='.$banana->state['group'].'&artid='.$this->id.'&part='.$i.'">'.$format.'</a>';
+                } else {
+                    $res .= $format;
+                }
+            }
+        }
+        $res .= '</th></tr>';
+ 
+        preg_match("@text/([^;]+);@", $this->headers['content-type'], $format);
+        $format = $format[1];
+        $res .= '<tr><td colspan="2">';
+        if ($format == 'html') {
+            $res .= formatbody($this->body, $format); 
+        } else {
+            $res .= '<pre>'.formatbody($this->body).'</pre>';
+        }
+        $res .= '</td></tr>';
 
         if (count($this->pj) > 0) {
             $res .= '<tr><th colspan="2">'._b_('Pièces jointes').'</th></tr>';
@@ -233,16 +335,14 @@ class BananaPost
             foreach ($this->pj as $file) {
                 $res .= $file['filename'].' ('.$file['MIME'].') : ';
                 $res .= '<a href="pj.php?group='.$banana->state['group'].'&artid='.$this->id.'&pj='.$i.'">télécharger</a>';
-                if (preg_match("@(image|text)/@", $file['MIME'])) {
-                    $res .= ' . <a href="pj.php?group='.$banana->state['group'].'&artid='.$this->id.'&pj='.$i.'&action=view">aperçu</a>';
-                }
+                $res .= ' . <a href="pj.php?group='.$banana->state['group'].'&artid='.$this->id.'&pj='.$i.'&action=view" target="_blank">aperçu</a>';
                 $res .=  '<br/>';
                 $i++;
             }
             $res .= '</td></tr>';
         }
         
-        $res .= '<tr><th colspan="2">'._b_('apercu').'</th></tr>';
+        $res .= '<tr><th colspan="2">'._b_('Apercu').'</th></tr>';
         $ndx  = $banana->spool->getndx($this->id);
         $res .= '<tr><td class="thrd" colspan="2">'.$banana->spool->to_html($ndx-$banana->tbefore, $ndx+$banana->tafter, $ndx).'</td></tr>';