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

This commit is contained in:
Klaus Leithoff 2014-01-07 12:58:35 +00:00
parent 6fd7ed4b2d
commit e7922714ae

View File

@ -2404,7 +2404,7 @@ class infolog_ui
{ {
$GLOBALS['egw_info']['flags']['currentapp'] = 'infolog'; $GLOBALS['egw_info']['flags']['currentapp'] = 'infolog';
if (is_array($_attachments)) if (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')&&is_array($_attachments))
{ {
//echo __METHOD__.'<br>'; //echo __METHOD__.'<br>';
//_debug_array($_attachments); //_debug_array($_attachments);
@ -2501,7 +2501,7 @@ class infolog_ui
$mailobject->openConnection(); $mailobject->openConnection();
$mailobject->reopen($mailbox); $mailobject->reopen($mailbox);
$mailcontent = $mailClass::get_mailcontent($mailobject,$uid,$partid,$mailbox); $mailcontent = $mailClass::get_mailcontent($mailobject,$uid,$partid,$mailbox,false,true,(!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')));
// this one adds the mail itself (as message/rfc822 (.eml) file) to the infolog as additional attachment // this one adds the mail itself (as message/rfc822 (.eml) file) to the infolog as additional attachment
// this is done to have a simple archive functionality (ToDo: opening .eml in email module) // this is done to have a simple archive functionality (ToDo: opening .eml in email module)