Commit b918927c authored by mku's avatar mku

ZP-325 #comment Merge contribution - BackendIMAP - Imap preview plaintext for...

ZP-325 #comment Merge contribution - BackendIMAP - Imap preview plaintext for mail with html code in text part #time 5m

git-svn-id: https://z-push.org/svn/z-push/trunk@1572 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
parent 9fd87ea6
...@@ -1036,7 +1036,6 @@ class BackendIMAP extends BackendDiff { ...@@ -1036,7 +1036,6 @@ class BackendIMAP extends BackendDiff {
} }
break; break;
case SYNC_BODYPREFERENCE_MIME: case SYNC_BODYPREFERENCE_MIME:
ZLog::Write(LOGLEVEL_DEBUG, "BackendIMAP->GetMessage MIME Format");
//We don't need to create a new MIME mail, we already have one!! //We don't need to create a new MIME mail, we already have one!!
$output->asbody->data = $mail; $output->asbody->data = $mail;
break; break;
...@@ -1057,7 +1056,7 @@ class BackendIMAP extends BackendDiff { ...@@ -1057,7 +1056,7 @@ class BackendIMAP extends BackendDiff {
$bpo = $contentparameters->BodyPreference($output->asbody->type); $bpo = $contentparameters->BodyPreference($output->asbody->type);
if (Request::GetProtocolVersion() >= 14.0 && $bpo->GetPreview()) { if (Request::GetProtocolVersion() >= 14.0 && $bpo->GetPreview()) {
$output->asbody->preview = Utils::Utf8_truncate($plainBody, $bpo->GetPreview()); $output->asbody->preview = Utils::Utf8_truncate(Utils::ConvertHtmlToText($plainBody), $bpo->GetPreview());
} }
else { else {
$output->asbody->truncated = 0; $output->asbody->truncated = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment