Put the 'New message' icon in the subject column

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

diff --git a/banana/post.inc.php b/banana/post.inc.php
index 8262285..93e36a6 100644 (file)
--- a/banana/post.inc.php
+++ b/banana/post.inc.php
@@ -196,7 +196,7 @@ class BananaPost
      */
     function _fix_charset()
     {
-        if (preg_match('!charset=([^;]*)\s*(;|$)!', $this->headers['content-type'], $matches)) {
+        if (preg_match('!charset="?([^;"]*)"?\s*(;|$)?!', $this->headers['content-type'], $matches)) {
             $body = iconv($matches[1], 'utf-8', $this->body);
             if (strlen($body) == 0) {
                 return false;
@@ -315,7 +315,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', 'Discussion précédente'),
+                         'prevPost'   => Array('prev',        'Article précédent'),
+                         'nextPost'   => Array('next',        'Article suivant'),
+                         'nextThread' => Array('next_thread', '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
@@ -351,8 +376,29 @@ 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><td class="headers"><table cellpadding="0" cellspacing="0">';
+        $res .= '<tr><th colspan="2" class="subject">'
+             . $this->_browser()
+             . '<div class="banana_action">'
+             . makeImgLink(Array('group'  => $this->group,
+                                 'action' => 'new'),
+                           'post.gif',
+                           'Nouveau message')
+             . makeImgLink(Array('group'  => $banana->state['group'],
+                                 'artid'  => $this->id,
+                                 'action' => 'new'),
+                           'reply.gif',
+                           'Répondre');
+        if ($this->checkCancel()) {
+            $res .= makeImgLink(Array('group'  => $banana->state['group'],
+                                      'artid'  => $this->id,
+                                      'action' => 'cancel'),
+                                'cancel.gif',
+                                'Annuler');
+        }
+        $res .= '</div>'
+             . formatDisplayHeader('subject', $this->headers['subject'])
+             . '</th></tr>'
+             . '<tr class="pair"><td class="headers"><table cellpadding="0" cellspacing="0">';
 
         foreach ($banana->show_hdr as $hdr) {
             if (isset($this->headers[$hdr])) {
@@ -371,12 +417,10 @@ class BananaPost
         }
         $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);
@@ -390,12 +434,12 @@ class BananaPost
                     $res .= $format;
                 }
             }
+            $res .= '</th></tr>';
         }
-        $res .= '</th></tr>';
  
         preg_match("@text/([^;]+);@", $this->headers['content-type'], $format);
         $format = $format[1];
-        $res .= '<tr><td colspan="2"';
+        $res .= '<tr class="impair"><td colspan="2"';
         if ($format == 'html') {
             if (preg_match('@<body[^>]*bgcolor="?([#0-9a-f]+)"?[^>]*>@i', $this->body, $bgcolor)) {
                 $res .= ' bgcolor="'.$bgcolor[1].'"';
@@ -428,10 +472,10 @@ class BananaPost
             $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>';
     }
 }