X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fpost.inc.php;h=1da8783772df2e3a51fd50e9a6faaed52dcad94f;hb=80110636e39525f21676fa41ecdd6bd06372dc16;hp=20ab505a8d5513a48ba93518c17a6771c7ed73ea;hpb=a7cb2f0d3680b1df846ef31313e4dbb7e4104865;p=banana.git

diff --git a/banana/post.inc.php b/banana/post.inc.php
index 20ab505..1da8783 100644
--- a/banana/post.inc.php
+++ b/banana/post.inc.php
@@ -23,6 +23,8 @@ class BananaPost
     var $pj;
     /** poster name */
     var $name;
+    /** test validity */
+    var $valid = true;
 
     /** constructor
      * @param $_id STRING MSGNUM or MSGID (a group should be selected in this case)  
@@ -33,12 +35,17 @@ class BananaPost
         $this->id       = $_id;
         $this->pj       = array();
         $this->messages = array();
-        $this->_header();
+        if (!$this->_header()) {
+            $this->valid = false; 
+            return null;
+        }
+
 
         if ($body = $banana->nntp->body($_id)) {
             $this->body = join("\n", $body);
         } else {
-            return ($this = null);
+            $this->valid = false;
+            return null;
         }
         
         if (isset($this->headers['content-transfer-encoding'])) {
@@ -52,13 +59,11 @@ class BananaPost
         if ($this->_split_multipart($this->headers, $this->body)) {
             $this->set_body_to_part(0);
         } else {
-            $this->_split_multipart($mpart_type[1], $mpart_boundary[1]);
-            $this->_find_uuencode();
-            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);
+            if(isset($mpart_type)) {
+                $this->_split_multipart($mpart_type[1], $mpart_boundary[1]);
             }
+            $this->_find_uuencode();
+            $this->_fix_charset();
         }
     }
 
@@ -87,7 +92,8 @@ class BananaPost
      */
     function _split_multipart($headers, $body)
     {
-        if (!preg_match("@multipart/([^;]+);@", $headers['content-type'], $type)) {
+        if (!isset($headers['content-type'])
+                || !preg_match("@multipart/([^;]+);@", $headers['content-type'], $type)) {
             return false;
         }
             
@@ -100,8 +106,10 @@ class BananaPost
             $local_header = $part['headers'];
             $local_body   = $part['body'];
             if (!$this->_split_multipart($local_header, $local_body)) {
-                $is_text = isset($local_header['content-type']) && preg_match("@text/([^;]+);@", $local_header['content-type'])
-                         && (!isset($local_header['content-disposition']) || !preg_match('@attachment@', $local_header['content-disposition'])); 
+                $is_text = isset($local_header['content-type'])
+                         && preg_match("@text/([^;]+);@", $local_header['content-type'])
+                         && (!isset($local_header['content-disposition']) 
+                             || !preg_match('@attachment@', $local_header['content-disposition'])); 
 
                 // alternative ==> multiple formats for messages
                 if ($type == 'alternative' && $is_text) {
@@ -133,6 +141,7 @@ class BananaPost
     {
         global $banana;
 
+        $local_headers = Array();
         $lines = split("\n", $part);
         while (count($lines)) {
             $line = array_shift($lines);
@@ -150,7 +159,12 @@ class BananaPost
                 break;
             }
         }
-        return Array('headers' => $local_headers, 'body' => join("\n", $lines)); 
+        $local_body = join("\n", $lines);
+        if (isset($local_headers['content-transfer-encoding'])
+                && preg_match("/quoted-printable/", $local_headers['content-transfer-encoding'])) {
+            $local_body = quoted_printable_decode($local_body);
+        }
+        return Array('headers' => $local_headers, 'body' => $local_body); 
     }
 
     /** add an attachment
@@ -160,27 +174,51 @@ class BananaPost
         $local_header = $part['headers'];
         $local_body = $part['body'];
 
-        if ((isset($local_header['content-disposition']) && preg_match("/filename=\"?([^\"]+)\"?/", $local_header['content-disposition'], $filename))
-            || (isset($local_header['content-type']) && preg_match("/name=\"?([^\"]+)\"?/", $local_header['content-type'], $filename))) {
+        if ((isset($local_header['content-disposition']) && preg_match('/filename="?([^"]+)"?/', $local_header['content-disposition'], $filename))
+            || (isset($local_header['content-type']) && preg_match('/name="?([^"]+)"?/', $local_header['content-type'], $filename))) {
             $filename = $filename[1];
         }           
         if (!isset($filename)) {
-            $filename = "attachment".count($pj);
+            $filename = "attachment" . count($this->pj);
         }
 
-        if (isset($local_header['content-type'])) {
-            if (preg_match("/^\\s*([^ ;]+);/", $local_header['content-type'], $mimetype)) {
-                $mimetype = $mimetype[1];
-            }
-        }
-        if (!isset($mimetype)) {
+        if (isset($local_header['content-type'])
+                && preg_match('/^\s*([^ ;]+);/', $local_header['content-type'], $mimetype)) {
+            $mimetype = $mimetype[1];
+        } else {
             return false;
         }
 
+        if (isset($local_header['content-id'])
+                && preg_match('/^\s*<([^> ]+)>/', $local_header['content-id'], $cid)) {
+            $cid = $cid[1];
+        } else {
+            $cid = null;
+        }
+
         array_push($this->pj, Array('MIME' => $mimetype,
                                     'filename' => $filename,
                                     'encoding' => strtolower($local_header['content-transfer-encoding']),
-                                    'data' => $local_body));
+                                    'data' => $local_body,
+                                    'cid' => $cid));
+        return true;
+    }
+
+    /** Fix body charset (convert body to utf8)
+     * @return false if failed
+     */
+    function _fix_charset()
+    {
+        if (isset($this->headers['content-type'])
+                && preg_match('!charset="?([^;"]*)"?\s*(;|$)?!', $this->headers['content-type'], $matches)) {
+            $body = iconv($matches[1], 'utf-8', $this->body);
+            if (strlen($body) == 0) {
+                return false;
+            }
+            $this->body = $body;
+        } else {
+            $this->body = utf8_encode($this->body);
+        }
         return true;
     }
 
@@ -199,6 +237,25 @@ class BananaPost
         }
     }
 
+    /** return local url for the given cid
+     * @param cid STRING
+     */
+    function find_attachment($cid)
+    {
+        global $banana;
+        $i = 0;
+        foreach ($this->pj as $pj) {
+            if ($pj['cid'] == $cid) {
+                return htmlentities(makeLink(Array('group'  => $banana->state['group'],
+                                                   'artid'  => $this->id,
+                                                   'pj'     => $i,
+                                                   'action' => 'view')));
+            }
+            $i++;
+        }
+        return 'cid:' . $cid;;
+    }
+
     /** decode an attachment
      * @param pjid INT id of the attachment to decode
      * @param action BOOL action to execute : true=view, false=download
@@ -246,11 +303,7 @@ class BananaPost
             }
         }
 
-        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);
-        }                                                        
+        $this->_fix_charset();
         return true;
     }
 
@@ -259,7 +312,6 @@ class BananaPost
         global $banana;
         $hdrs = $banana->nntp->head($this->id);
         if (!$hdrs) {
-            $this = null;
             return false;
         }
 
@@ -288,6 +340,7 @@ class BananaPost
         $this->name = $this->headers['from'];
         $this->name = preg_replace('/<[^ ]*>/', '', $this->name);
         $this->name = trim($this->name);
+        return true;
     }
 
     function checkcancel()
@@ -295,7 +348,32 @@ class BananaPost
         if (function_exists('hook_checkcancel')) {
             return hook_checkcancel($this->headers);
         }
-        return ($this->headers['from'] == $_SESSION['name']." <".$_SESSION['mail'].">");
+        if (!isset($_SESSION)) {
+            return false;
+        }
+        return ($this->headers['from'] == $_SESSION['name'] . ' <' . $_SESSION['mail']. '>');
+    }
+
+    /** Make some links to browse the current newsgroup
+     */
+    function _browser()
+    {
+        global $banana;
+        $ret = '<div class="banana_menu">';
+        $actions = Array('prevThread' => Array('prev_thread', _b_('Discussion précédente')),
+                         'prevPost'   => Array('prev',        _b_('Article précédent')),
+                         'nextPost'   => Array('next',        _b_('Article suivant')),
+                         'nextThread' => Array('next_thread', _b_('Discussion suivante')));
+        foreach ($actions as $method=>$params) {
+            $id = $banana->spool->$method($this->id);
+            if (!is_null($id)) {
+                $ret .= makeImgLink(Array('group' => $banana->state['group'],
+                                          'artid' => $id),
+                                    $params[0] . '.gif',
+                                    $params[1]);
+            }
+        }
+        return $ret . '</div>';
     }
 
     /** convert message to html
@@ -331,43 +409,81 @@ class BananaPost
         }
 
         $res  = '<table class="bicol banana_msg" cellpadding="0" cellspacing="0">';
-        $res .= '<tr><th colspan="2">'._b_('En-têtes').'</th></tr>';
+        $res .= '<tr><th colspan="2" class="subject">'
+             . $this->_browser()
+             . '<div class="banana_action">'
+             . makeImgLink(Array('group'  => $banana->state['group'],
+                                 'action' => 'new'),
+                           'post.gif',
+                           _b_('Nouveau message')) . '&nbsp;'
+             . makeImgLink(Array('group'  => $banana->state['group'],
+                                 'artid'  => $this->id,
+                                 'action' => 'new'),
+                           'reply.gif',
+                           _b_('Répondre'));
+        if ($this->checkCancel()) {
+            $res .= '&nbsp;'
+                  . makeImgLink(Array('group'  => $banana->state['group'],
+                                      'artid'  => $this->id,
+                                      'action' => 'cancel'),
+                                'cancel.gif',
+                                _b_('Annuler'));
+        }
+        $res .= '</div>'
+             . formatDisplayHeader('subject', $this->headers['subject'])
+             . '</th></tr>'
+             . '<tr class="pair"><td class="headers"><table cellpadding="0" cellspacing="0">';
 
+        $xface = null;
         foreach ($banana->show_hdr as $hdr) {
             if (isset($this->headers[$hdr])) {
                 $res2 = formatdisplayheader($hdr, $this->headers[$hdr]);
-                if ($res2) {
+                if ($res2 && ($hdr != 'x-face' || !$banana->formatxface)) {
                     $res .= '<tr><td class="hdr">'.header_translate($hdr)."</td><td class='val'>$res2</td></tr>\n";
+                } else if ($res2) {
+                    $xface = $res2;
                 }
             }
         }
+        $res .= '</table></td><td class="xface">';
+
+        if ($xface) {
+            $res .= $xface;
+        }
+        $res .= '</td></tr>';
 
-        $res .= '<tr><th colspan="2">'._b_('Corps');
         if (count($this->messages) > 1) {
+            $res .= '<tr><th colspan="2">';        
             for ($i = 0 ; $i < count($this->messages) ; $i++) {
-                if ($i == 0) {
-                    $res .= ' : ';
-                } else {
+                if ($i != 0) {
                     $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>';
+                    $res .= makeHREF(Array('group' => $banana->state['group'],
+                                           'artid' => $this->id,
+                                           'part'  => $i),
+                                     $format);
                 } else {
                     $res .= $format;
                 }
             }
+            $res .= '</th></tr>';
         }
-        $res .= '</th></tr>';
  
-        preg_match("@text/([^;]+);@", $this->headers['content-type'], $format);
-        $format = $format[1];
-        $res .= '<tr><td colspan="2"';
+        if (isset($this->headers['content-type'])
+                && preg_match("@text/([^;]+);@", $this->headers['content-type'], $format)) {
+            $format = $format[1];
+        } else {
+            $format = 'plain';
+        }
+        $res .= '<tr class="impair"><td colspan="2" class="body"';
         if ($format == 'html') {
             if (preg_match('@<body[^>]*bgcolor="?([#0-9a-f]+)"?[^>]*>@i', $this->body, $bgcolor)) {
                 $res .= ' bgcolor="'.$bgcolor[1].'"';
             }
+            $this->body = preg_replace('/cid:([^\'" ]+)/e', "find_attachment('\\1')", $this->body);
             $res .= '>'.formatbody($this->body, $format); 
         } else {
             $res .= '><pre>'.formatbody($this->body).'</pre>';
@@ -379,21 +495,39 @@ class BananaPost
             $res .= '<tr><td colspan="2">';
             $i = 0;
             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>';
-                $res .= ' . <a href="pj.php?group='.$banana->state['group'].'&artid='.$this->id.'&pj='.$i.'&action=view" target="_blank">aperçu</a>';
+                $res .= makeImgLink(Array('group' => $banana->state['group'],
+                                          'artid' => $this->id,
+                                          'pj'    => $i),
+                                    'save.gif',
+                                    _b_('Télécharger')) . ' ';
+                $res .= makeImgLink(Array('group' => $banana->state['group'],
+                                          'artid' => $this->id,
+                                          'pj'    => $i,
+                                          'action'=> 'view'),
+                                    'preview.gif',
+                                    _b_('Aperçu'));
+                $res .= ' ' . $file['filename'].' ('.$file['MIME'].')';
                 $res .=  '<br/>';
                 $i++;
             }
             $res .= '</td></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>';
-
+        $res .= '<tr><td class="thrd" colspan="2">'
+             . $banana->spool->to_html($ndx-$banana->tbefore, $ndx+$banana->tafter, $ndx)
+             . '</td></tr>';
         return $res.'</table>';
     }
 }
 
+/** Wrapper for Post::find_attachment
+ */
+function find_attachment($cid)
+{
+    global $banana;
+    return $banana->post->find_attachment($cid);
+}
+
+// vim:set et sw=4 sts=4 ts=4
 ?>