holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail/Mailhandling: introduce option >mail text only< for better control of import of mails to other apps

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-07 13:03:53 +00:00
parent e7922714ae
commit 5786979a94
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/inc/class.mail_bo.inc.php
View File

@ -4781,13 +4781,14 @@ class mail_bo
* @param mailbox the mailbox, that holds the message * @param mailbox the mailbox, that holds the message
* @param preserveHTML flag to pass through to getdisplayableBody * @param preserveHTML flag to pass through to getdisplayableBody
* @param addHeaderSection flag to be able to supress headersection * @param addHeaderSection flag to be able to supress headersection
* @param includeAttachments flag to be able to supress possible attachments
* @return array/bool with 'mailaddress'=>$mailaddress, * @return array/bool with 'mailaddress'=>$mailaddress,
* 'subject'=>$subject, * 'subject'=>$subject,
* 'message'=>$message, * 'message'=>$message,
* 'attachments'=>$attachments, * 'attachments'=>$attachments,
* 'headers'=>$headers,; boolean false on failure * 'headers'=>$headers,; boolean false on failure
*/ */
static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false, $addHeaderSection=true) static function get_mailcontent(&$mailClass,$uid,$partid='',$mailbox='', $preserveHTML = false, $addHeaderSection=true, $includeAttachments=true)
{ {
//echo __METHOD__." called for $uid,$partid <br>"; //echo __METHOD__." called for $uid,$partid <br>";
$headers = $mailClass->getMessageHeader($uid,$partid,true); $headers = $mailClass->getMessageHeader($uid,$partid,true);
@ -4807,7 +4808,7 @@ class mail_bo
} }
} }
//error_log(array2string($bodyParts)); //error_log(array2string($bodyParts));
$attachments = $mailClass->getMessageAttachments($uid,$partid); $attachments = $includeAttachments?$mailClass->getMessageAttachments($uid,$partid):array();
if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO']; if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO'];
elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM']; elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM'];

1
mail/lang/egw_de.lang
View File

@ -53,6 +53,7 @@ connect to profile %1 mail de Verbunden zu dem Profil :%1
connection status mail de Verbindungsstatus connection status mail de Verbindungsstatus
contains mail de beinhaltet contains mail de beinhaltet
contains(*) mail de enthält(*) contains(*) mail de enthält(*)
convert only mail to item (ignore possible attachments) mail de konvertiere nur den E-Mail-Text zum Eintrag ohne mögliche Anhänge zu beachten
convert mail to item and attach its attachments to this item (standard) mail de konvertiere E-Mail zum Eintrag und füge die Mailanhänge hinzu (Standard) convert mail to item and attach its attachments to this item (standard) mail de konvertiere E-Mail zum Eintrag und füge die Mailanhänge hinzu (Standard)
convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment mail de konvertiere E-Mail zum Eintrag und füge die Mailanhänge, sowie die Original Nachricht, als message/rfc (.eml) Datei hinzu. convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment mail de konvertiere E-Mail zum Eintrag und füge die Mailanhänge, sowie die Original Nachricht, als message/rfc (.eml) Datei hinzu.
copied %1 message(s) from %2 to %3 mail de %1 Nachricht(en) wurden von %2 nach %3 kopiert copied %1 message(s) from %2 to %3 mail de %1 Nachricht(en) wurden von %2 nach %3 kopiert

1
mail/lang/egw_en.lang
View File

@ -52,6 +52,7 @@ connect to profile %1 mail en Connect to Profile %1
connection status mail en Connection Status connection status mail en Connection Status
contains mail en contains contains mail en contains
contains(*) mail en Contains(*) contains(*) mail en Contains(*)
convert only mail to item (ignore possible attachments) mail en convert only Mail to item (ignore possible attachments)
convert mail to item and attach its attachments to this item (standard) mail en convert Mail to item and attach its attachments to this item (standard) convert mail to item and attach its attachments to this item (standard) mail en convert Mail to item and attach its attachments to this item (standard)
convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment mail en convert Mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment mail en convert Mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment
copied %1 message(s) from %2 to %3 mail en copied %1 message(s) from %2 to %3 copied %1 message(s) from %2 to %3 mail en copied %1 message(s) from %2 to %3