$this->id = $_id;
$this->pj = array();
$this->messages = array();
- $this->_header();
+ if (!$this->_header()) {
+ return null;
+ }
+
if ($body = $banana->nntp->body($_id)) {
$this->body = join("\n", $body);
} else {
- return ($this = null);
+ return null;
}
if (isset($this->headers['content-transfer-encoding'])) {
}
}
- 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);
+ if ($this->_split_multipart($this->headers, $this->body)) {
+ $this->set_body_to_part(0);
} else {
- $this->body = utf8_encode($this->body);
+ $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);
+ }
+ }
+ }
+
+ /** find and add uuencoded attachments
+ */
+ function _find_uuencode()
+ {
+ if (preg_match_all('@\n(begin \d+ ([^\r\n]+)\r?(?:\n(?!end)[^\n]*)*\nend)@', $this->body, $matches, PREG_SET_ORDER)) {
+ foreach ($matches as $match) {
+ $mime = trim(exec('echo '.escapeshellarg($match[1]).' | uudecode -o /dev/stdout | file -bi -'));
+ if ($mime != 'application/x-empty') {
+ $this->body = trim(str_replace($match[0], '', $this->body));
+ $body = $match[1];
+ $header['content-type'] = $mime.'; name="'.$match[2].'"';
+ $header['content-transfer-encoding'] = 'x-uuencode';
+ $header['content-disposition'] = 'attachment; filename="'.$match[2].'"';
+ $this->_add_attachment(Array('headers' => $header, 'body' => $body));
+ }
+ }
}
}
* @param $type STRING multipart type description
* @param $boundary STRING multipart boundary identification string
*/
- function split_multipart($type, $boundary)
+ function _split_multipart($headers, $body)
{
- $parts = preg_split("/\n--$boundary(--|\n)/", $this->body);
+ if (!preg_match("@multipart/([^;]+);@", $headers['content-type'], $type)) {
+ return false;
+ }
+
+ preg_match("/boundary=\"?([^ \"]+)\"?/", $headers['content-type'], $boundary);
+ $boundary = $boundary[1];
+ $type = $type[1];
+ $parts = preg_split("@\n--$boundary(--|\n)@", $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'], $format)) {
- array_push($this->messages, $part);
- }
- }
- if (count($this->messages) > 0) {
- $this->set_body_to_part(0);
+ $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']));
+
+ // alternative ==> multiple formats for messages
+ if ($type == 'alternative' && $is_text) {
+ array_push($this->messages, $part);
+
+ // !alternative ==> une body, others are attachments
+ } else if ($is_text) {
+ if (count($this->messages) == 0) {
+ $this->body = $local_body;
+ foreach (array_keys($local_header) as $key) {
+ $this->header[$key] = $local_header[$key];
+ }
+ array_push($this->messages, $part);
+ } else {
+ $this->_add_attachment($part);
+ }
+ } else {
+ $this->_add_attachment($part);
+ }
+ }
}
+ return true;
}
/** extract new headers from the part
* @param $part STRING part of a multipart message
*/
- function get_part($part)
+ function _get_part($part)
{
global $banana;
while (count($lines)) {
$line = array_shift($lines);
if ($line != "") {
- list($hdr, $val) = split(":[ \t\r]*", $line, 2);
- $hdr = strtolower($hdr);
- if (in_array($hdr, $banana->parse_hdr)) {
- $local_headers[$hdr] = $val;
+ if (preg_match('@^[\t\r ]+@', $line) && isset($hdr)) {
+ $local_headers[$hdr] .= ' '.trim($line);
+ } else {
+ list($hdr, $val) = split(":[ \t\r]*", $line, 2);
+ $hdr = strtolower($hdr);
+ if (in_array($hdr, $banana->parse_hdr)) {
+ $local_headers[$hdr] = $val;
+ }
}
} else {
break;
}
}
- return Array('headers' => $local_headers, 'body' => join("\n", $lines));
+ $local_body = join("\n", $lines);
+ if (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
*/
- function add_attachment($part)
+ function _add_attachment($part)
{
$local_header = $part['headers'];
$local_body = $part['body'];
- if (!isset($local_header['content-transfer-encoding'])) {
- return false;
- }
-
- if (isset($local_header['content-disposition'])) {
- if (preg_match("/attachment/", $local_header['content-disposition'])) {
- preg_match("/filename=\"?([^\"]+)\"?/", $local_header['content-disposition'], $filename);
- $filename = $filename[1];
- }
- }
+ 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);
}
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;
+ }
+ if ($format[1] == 'richtext') {
+ return htmlToPlainText(richtextToHtml($this->body));
+ } else {
+ return htmlToPlainText($this->body);
+ }
+ }
+
/** decode an attachment
* @param pjid INT id of the attachment to decode
* @param action BOOL action to execute : true=view, false=download
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 if ($file['encoding'] == 'x-uuencode') {
+ passthru('echo '.escapeshellarg($file['data']).' | uudecode -o /dev/stdout');
} else {
header('Content-Transfer-Encoding: '.$file['encoding']);
echo $file['data'];
$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;
}
global $banana;
$hdrs = $banana->nntp->head($this->id);
if (!$hdrs) {
- $this = null;
return false;
}
$this->name = $this->headers['from'];
$this->name = preg_replace('/<[^ ]*>/', '', $this->name);
$this->name = trim($this->name);
+ return true;
}
function checkcancel()
/** convert message to html
* @param partid INT id of the multipart message that must be displaid
*/
- function to_html($partid = 0)
+ function to_html($partid = -1)
{
global $banana;
- if ($partid != 0) {
- $this->set_body_to_part($partid);
+ 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>';
+ $res .= '<tr><td class="headers"><table cellpadding="0" cellspacing="0">';
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) {
preg_match("@text/([^;]+);@", $this->headers['content-type'], $format);
$format = $format[1];
- $res .= '<tr><td colspan="2">';
+ $res .= '<tr><td colspan="2"';
if ($format == 'html') {
- $res .= formatbody($this->body, $format);
+ if (preg_match('@<body[^>]*bgcolor="?([#0-9a-f]+)"?[^>]*>@i', $this->body, $bgcolor)) {
+ $res .= ' bgcolor="'.$bgcolor[1].'"';
+ }
+ $res .= '>'.formatbody($this->body, $format);
} else {
- $res .= '<pre>'.formatbody($this->body).'</pre>';
+ $res .= '
><pre>'.formatbody($this->body).'</pre>';
}
$res .= '</td></tr>';
$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>';
- 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="?group='.$banana->state['group'].'&artid='.$this->id.'&pj='.$i.'">télécharger</a>';
+ $res .= ' . <a href="?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>';
projects / banana.git / blobdiff