if ($this->_split_multipart($this->headers, $this->body)) {
$this->set_body_to_part(0);
- } elseif(isset($mpart_type)) {
- $this->_split_multipart($mpart_type[1], $mpart_boundary[1]);
+ } else {
+ if(isset($mpart_type)) {
+ $this->_split_multipart($mpart_type[1], $mpart_boundary[1]);
+ }
$this->_find_uuencode();
$this->_fix_charset();
}
*/
function _fix_charset()
{
- if (preg_match('!charset="?([^;"]*)"?\s*(;|$)?!', $this->headers['content-type'], $matches)) {
+ 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;
. makeImgLink(Array('group' => $banana->state['group'],
'action' => 'new'),
'post.gif',
- _b_('Nouveau message'))
+ _b_('Nouveau message')) . ' '
. makeImgLink(Array('group' => $banana->state['group'],
'artid' => $this->id,
'action' => 'new'),
'reply.gif',
_b_('RĂ©pondre'));
if ($this->checkCancel()) {
- $res .= makeImgLink(Array('group' => $banana->state['group'],
+ $res .= ' '
+ . makeImgLink(Array('group' => $banana->state['group'],
'artid' => $this->id,
'action' => 'cancel'),
'cancel.gif',
$res .= '</th></tr>';
}
- preg_match("@text/([^;]+);@", $this->headers['content-type'], $format);
- $format = $format[1];
+ 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)) {