|
|
@ -326,10 +326,11 @@ class rcube_message
|
|
|
|
* a real part not an attachment (or its part)
|
|
|
|
* a real part not an attachment (or its part)
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param bool $enriched Enables checking for text/enriched parts too
|
|
|
|
* @param bool $enriched Enables checking for text/enriched parts too
|
|
|
|
|
|
|
|
* @param rcube_message_part &$part Reference to the part if found
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @return bool True if a HTML is available, False if not
|
|
|
|
* @return bool True if a HTML is available, False if not
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
function has_html_part($enriched = false)
|
|
|
|
public function has_html_part($enriched = false, &$part = null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// check all message parts
|
|
|
|
// check all message parts
|
|
|
|
foreach ($this->mime_parts as $part) {
|
|
|
|
foreach ($this->mime_parts as $part) {
|
|
|
@ -363,6 +364,8 @@ class rcube_message
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$part = null;
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -371,9 +374,11 @@ class rcube_message
|
|
|
|
* Determine if the message contains a text/plain part. This must to be
|
|
|
|
* Determine if the message contains a text/plain part. This must to be
|
|
|
|
* a real part not an attachment (or its part)
|
|
|
|
* a real part not an attachment (or its part)
|
|
|
|
*
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param rcube_message_part &$part Reference to the part if found
|
|
|
|
|
|
|
|
*
|
|
|
|
* @return bool True if a plain text part is available, False if not
|
|
|
|
* @return bool True if a plain text part is available, False if not
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
function has_text_part()
|
|
|
|
public function has_text_part(&$part = null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// check all message parts
|
|
|
|
// check all message parts
|
|
|
|
foreach ($this->mime_parts as $part) {
|
|
|
|
foreach ($this->mime_parts as $part) {
|
|
|
@ -403,6 +408,8 @@ class rcube_message
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$part = null;
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -410,49 +417,53 @@ class rcube_message
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Return the first HTML part of this message
|
|
|
|
* Return the first HTML part of this message
|
|
|
|
*
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param rcube_message_part &$part Reference to the part if found
|
|
|
|
|
|
|
|
* @param bool $enriched Enables checking for text/enriched parts too
|
|
|
|
|
|
|
|
*
|
|
|
|
* @return string HTML message part content
|
|
|
|
* @return string HTML message part content
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
function first_html_part()
|
|
|
|
public function first_html_part(&$part = null, $enriched = false)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// check all message parts
|
|
|
|
if ($this->has_html_part($enriched, $part)) {
|
|
|
|
foreach ($this->mime_parts as $pid => $part) {
|
|
|
|
$body = $this->get_part_body($part->mime_id, true);
|
|
|
|
if ($part->mimetype == 'text/html') {
|
|
|
|
|
|
|
|
return $this->get_part_body($pid, true);
|
|
|
|
if ($part->mimetype == 'text/enriched') {
|
|
|
|
|
|
|
|
$body = rcube_enriched::to_html($body);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return $body;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Return the first text part of this message
|
|
|
|
* Return the first text part of this message.
|
|
|
|
|
|
|
|
* If there's no text/plain part but $strict=true and text/html part
|
|
|
|
|
|
|
|
* exists, it will be returned in text/plain format.
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param rcube_message_part &$part Reference to the part if found
|
|
|
|
|
|
|
|
* @param bool $strict Check only text/plain parts
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param rcube_message_part $part Reference to the part if found
|
|
|
|
|
|
|
|
* @return string Plain text message/part content
|
|
|
|
* @return string Plain text message/part content
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
function first_text_part(&$part=null)
|
|
|
|
public function first_text_part(&$part = null, $strict = false)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// no message structure, return complete body
|
|
|
|
// no message structure, return complete body
|
|
|
|
if (empty($this->parts))
|
|
|
|
if (empty($this->parts)) {
|
|
|
|
return $this->body;
|
|
|
|
return $this->body;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// check all message parts
|
|
|
|
if ($this->has_text_part($part)) {
|
|
|
|
foreach ($this->mime_parts as $mime_id => $part) {
|
|
|
|
return $this->get_part_body($part->mime_id, true);
|
|
|
|
if ($part->mimetype == 'text/plain') {
|
|
|
|
|
|
|
|
return $this->get_part_body($mime_id, true);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ($part->mimetype == 'text/html') {
|
|
|
|
|
|
|
|
$out = $this->get_part_body($mime_id, true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!$strict && ($body = $this->first_html_part($part, true))) {
|
|
|
|
// create instance of html2text class
|
|
|
|
// create instance of html2text class
|
|
|
|
$txt = new rcube_html2text($out);
|
|
|
|
$h2t = new rcube_html2text($body);
|
|
|
|
return $txt->get_text();
|
|
|
|
return $h2t->get_text();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$part = null;
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Checks if part of the message is an attachment (or part of it)
|
|
|
|
* Checks if part of the message is an attachment (or part of it)
|
|
|
|