jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bug fixed where mails where nearly empty. HTML mails can now be received.

Browse source
This commit is contained in:
Michael 2012-02-25 02:37:39 +01:00
parent a74b0746b1
commit 01301a6169
1 changed files with 74 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
include/email.php
View file

@ -85,14 +85,27 @@ function email_get_msg($mbox,$uid) {
// file_put_contents($file, json_encode($struc));
if(! $struc->parts) {
$ret['body'] = email_get_part($mbox,$uid,$struc,0);
$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
if (trim($ret['body']) == '')
$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'plain');
else
$ret['body'] = html2bbcode($ret['body']);
}
else {
$text = '';
$html = '';
foreach($struc->parts as $ptop => $p) {
$x = email_get_part($mbox,$uid,$p,$ptop + 1);
if($x)
$ret['body'] = $x;
$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain');
if($x) $text .= $x;
$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'html');
if($x) $html .= $x;
}
if (trim($html) != '')
$ret['body'] = html2bbcode($html);
else
$ret['body'] = $text;
}
return $ret;
}
@ -100,11 +113,11 @@ function email_get_msg($mbox,$uid) {
// At the moment - only return plain/text.
// Later we'll repackage inline images as data url's and make the HTML safe
function email_get_part($mbox,$uid,$p,$partno) {
function email_get_part($mbox,$uid,$p,$partno, $subtype) {
// $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
global $htmlmsg,$plainmsg,$charset,$attachments;
//echo $partno;
//echo $partno."\n";
// DECODE DATA
$data = ($partno)
@ -127,7 +140,7 @@ function email_get_part($mbox,$uid,$p,$partno) {
if ($p->parameters)
foreach ($p->parameters as $x)
$params[strtolower($x->attribute)] = $x->value;
if ($p->dparameters)
if (isset($p->dparameters) and $p->dparameters)
foreach ($p->dparameters as $x)
$params[strtolower($x->attribute)] = $x->value;
@ -135,7 +148,7 @@ function email_get_part($mbox,$uid,$p,$partno) {
// Any part with a filename is an attachment,
// so an attached text file (type 0) is not mistaken as the message.
if ($params['filename'] || $params['name']) {
if ((isset($params['filename']) and $params['filename']) || (isset($params['name']) and $params['name'])) {
// filename may be given as 'Filename' or 'Name' or both
$filename = ($params['filename'])? $params['filename'] : $params['name'];
// filename may be encoded, so see imap_mime_header_decode()
@ -146,9 +159,10 @@ function email_get_part($mbox,$uid,$p,$partno) {
if ($p->type == 0 && $data) {
// Messages may be split in different parts because of inline attachments,
// so append parts together with blank row.
if (strtolower($p->subtype)=='plain')
if (strtolower($p->subtype)==$subtype) {
$data = iconv($params['charset'], 'UTF-8//IGNORE', $data);
return (trim($data) ."\n\n");
else
} else
$data = '';
// $htmlmsg .= $data ."<br><br>";
@ -165,12 +179,14 @@ function email_get_part($mbox,$uid,$p,$partno) {
// }
// SUBPART RECURSION
if ($p->parts) {
if (isset($p->parts) and $p->parts) {
$x = "";
foreach ($p->parts as $partno0=>$p2) {
$x = email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1)); // 1.2, 1.2.1, etc.
if($x)
return $x;
$x .= email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype); // 1.2, 1.2.1, etc.
//if($x)
// return $x;
}
return $x;
}
}