X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fpost.inc.php;h=3ee59cf825ba33f461aa13347f92d10f9b1df3a9;hb=dc12019c868a8e302a29e2730f7da8afa67ab990;hp=b240ca201aa4d5b42130a0725231bcc09aa1e445;hpb=856dc84a68639a703985d9627bb86fbcabf6b7d0;p=banana.git
diff --git a/banana/post.inc.php b/banana/post.inc.php
index b240ca2..3ee59cf 100644
--- a/banana/post.inc.php
+++ b/banana/post.inc.php
@@ -59,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();
}
}
@@ -94,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;
}
@@ -107,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) {
@@ -140,6 +141,7 @@ class BananaPost
{
global $banana;
+ $local_headers = Array();
$lines = split("\n", $part);
while (count($lines)) {
$line = array_shift($lines);
@@ -158,7 +160,8 @@ class BananaPost
}
}
$local_body = join("\n", $lines);
- if (preg_match("/quoted-printable/", $local_headers['content-transfer-encoding'])) {
+ 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);
@@ -171,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;
}
@@ -210,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
@@ -257,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;
}
@@ -306,7 +348,33 @@ 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 = '
';
}
/** convert message to html
@@ -342,9 +410,32 @@ class BananaPost
}
$res = '';
- $res .= ''._b_('En-têtes').' |
';
- $res .= '|