X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=banana%2Fpost.inc.php;h=df64f2715200fa46fff1e5f1fafbe2d4531a802c;hb=39816f8b637dbd80dc1a64f1a04adb4f3cf24a9f;hp=f9ca5cc5b516b392b9d898f37b3ca6760959ae09;hpb=78cd27b3ec8300e0a8ed7e6b909e3ea99fa75911;p=banana.git
diff --git a/banana/post.inc.php b/banana/post.inc.php
index f9ca5cc..df64f27 100644
--- a/banana/post.inc.php
+++ b/banana/post.inc.php
@@ -17,6 +17,10 @@ class BananaPost
var $headers;
/** body */
var $body;
+ /** formating */
+ var $messages;
+ /** attachment */
+ var $pj;
/** poster name */
var $name;
@@ -26,7 +30,9 @@ class BananaPost
function BananaPost($_id)
{
global $banana;
- $this->id = $_id;
+ $this->id = $_id;
+ $this->pj = array();
+ $this->messages = array();
$this->_header();
if ($body = $banana->nntp->body($_id)) {
@@ -43,11 +49,166 @@ 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]);
+ } else {
+ 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);
+ }
+ }
+ }
+
+ /** split multipart messages
+ * @param $type STRING multipart type description
+ * @param $boundary STRING multipart boundary identification string
+ */
+ function _split_multipart($type, $boundary)
+ {
+ $parts = preg_split("/\n--$boundary(--|\n)/", $this->body);
+ foreach ($parts as $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);
+ }
+ }
+ $this->set_body_to_part(0);
+ }
+
+ /** extract new headers from the part
+ * @param $part STRING part of a multipart message
+ */
+ function _get_part($part)
+ {
+ global $banana;
+
+ $lines = split("\n", $part);
+ 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;
+ }
+ } else {
+ break;
+ }
+ }
+ return Array('headers' => $local_headers, 'body' => join("\n", $lines));
+ }
+
+ /** add an attachment
+ */
+ 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($filename)) {
+ $filename = "attachment".count($pj);
+ }
+
+ if (isset($local_header['content-type'])) {
+ if (preg_match("/^\\s*([^ ;]+);/", $local_header['content-type'], $mimetype)) {
+ $mimetype = $mimetype[1];
+ }
+ }
+ if (!isset($mimetype)) {
+ 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("@
]>@", "@@@#@", $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)
+ {
+ if ($pjid >= count($this->pj)) {
+ return false;
+ } else {
+ $file = $this->pj[$pjid];
+ 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 {
+ header('Content-Transfer-Encoding: '.$file['encoding']);
+ echo $file['data'];
+ }
+ return true;
+ }
+ }
+
+ /** 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()
@@ -94,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 = '
'._b_('En-têtes').' | |
---|---|
'._b_('Corps').' | |
'.formatbody($this->body).' | |
'._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 .= ''.$format.''; + } else { + $res .= $format; + } + } + } + $res .= ' | |
';
+ if ($format == 'html') {
+ $res .= formatbody($this->body, $format);
+ } else {
+ $res .= ''.formatbody($this->body).''; + } + $res .= ' | |
'._b_('Pièces jointes').' | |
';
+ $i = 0;
+ foreach ($this->pj as $file) {
+ $res .= $file['filename'].' ('.$file['MIME'].') : ';
+ $res .= 'télécharger';
+ $res .= ' . aperçu';
+ $res .= ' '; + $i++; + } + $res .= ' | |
'._b_('apercu').' | |
'._b_('Apercu').' | |
'.$banana->spool->to_html($ndx-$banana->tbefore, $ndx+$banana->tafter, $ndx).' |