extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to inform user properly when forward/reply failure of encrypted smime message happens

Browse Source
This commit is contained in:
Hadi Nategh 2018-02-07 16:56:39 +01:00
parent 3bbad14683
commit d965fa0f6b
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mail/inc/class.mail_compose.inc.php
View File

@ -1813,19 +1813,31 @@ class mail_compose
unset($this->sessionData['in-reply-to']); unset($this->sessionData['in-reply-to']);
unset($this->sessionData['to']); unset($this->sessionData['to']);
unset($this->sessionData['cc']); unset($this->sessionData['cc']);
if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false))) { try
//error_log(__METHOD__.__LINE__.':'.array2string($attachments)); {
foreach($attachments as $attachment) { if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false))) {
if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment') //error_log(__METHOD__.__LINE__.':'.array2string($attachments));
{ foreach($attachments as $attachment) {
$this->addMessageAttachment($_uid, $attachment['partID'], if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
$_folder, {
$attachment['name'], $this->addMessageAttachment($_uid, $attachment['partID'],
$attachment['mimeType'], $_folder,
$attachment['size']); $attachment['name'],
$attachment['mimeType'],
$attachment['size']);
}
} }
} }
} }
catch (Mail\Smime\PassphraseMissing $e)
{
error_log(__METHOD__.'() Failed to forward because of smime '.$e->getMessage());
Framework::message(lang('Forwarding of this message failed'.
' because the content of this message seems to be encrypted'.
' and can not be decrypted properly. If you still wish to'.
' forward content of this encrypted message, you may try'.
' to use forward as attachment instead.'),'error');
}
} }
$mail_bo->closeConnection(); $mail_bo->closeConnection();
if ($_mode) if ($_mode)
@ -2150,7 +2162,19 @@ class mail_compose
//_debug_array($headers); //_debug_array($headers);
//error_log(__METHOD__.__LINE__.'->'.array2string($this->mailPreferences['htmlOptions'])); //error_log(__METHOD__.__LINE__.'->'.array2string($this->mailPreferences['htmlOptions']));
$bodyParts = $mail_bo->getMessageBody($_uid, ($this->mailPreferences['htmlOptions']?$this->mailPreferences['htmlOptions']:''), $_partID); try {
$bodyParts = $mail_bo->getMessageBody($_uid, ($this->mailPreferences['htmlOptions']?$this->mailPreferences['htmlOptions']:''), $_partID);
}
catch (Mail\Smime\PassphraseMissing $e)
{
$bodyParts = '';
error_log(__METHOD__.'() Failed to reply because of smime '.$e->getMessage());
Framework::message(lang('Replying to this message failed'.
' because the content of this message seems to be encrypted'.
' and can not be decrypted properly. If you still wish to include'.
' content of this encrypted message, you may try to use forward as'.
' attachment instead.'),'error');
}
//_debug_array($bodyParts); //_debug_array($bodyParts);
$styles = Mail::getStyles($bodyParts); $styles = Mail::getStyles($bodyParts);