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

rest of reply with attachments

Browse Source
This commit is contained in:
ralf 2024-09-02 14:13:02 +02:00
parent a8909da9d8
commit 4f0e7aa44c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1576,9 +1576,14 @@ class mail_compose
$suppressSigOnTop = true;
}
break;
case 'reply_attachments':
$content = $this->getForwardData($icServer, $folder, $msgUID, $part_id, 'inline');
// fall through (everything but attachments get overwritten)
case 'reply':
case 'reply_single':
case 'reply_all':
$content = $this->getReplyData($from == 'reply' ? 'single' : 'all', $icServer, $folder, $msgUID, $part_id);
$content = $this->getReplyData(str_replace('reply_', '', $from) ?: 'single',
$icServer, $folder, $msgUID, $part_id);
if ($content['mimeType'] === 'plain' && $GLOBALS['egw_info']['user']['preferences']['mail']['replyOptions'] === 'html')
{
$content['body'] = htmlspecialchars($content['body']);
@ -2182,7 +2187,8 @@ class mail_compose
* @param $_mode can be:
* single: for a reply to one address
* all: for a reply to all
* forward: inlineforwarding of a message with its attachments
* attachments: (single) reply with attachments, like inline-forwarding
* forward: inline-forwarding of a message with its attachments
* @param $_icServer number (0 as it is the active Profile)
* @param $_folder string
* @param $_uid number
@ -2382,7 +2388,8 @@ class mail_compose
foreach($newBody ? explode("\n",$newBody) : [] as $value) {
// Try to remove signatures from quoted parts to avoid multiple
// signatures problem in reply (rfc3676#section-4.3).
if ($_mode != 'forward' && ($hasSignature || ($hasSignature = preg_match("/^--\s[\r\n]$/",$value))))
if (!in_array($_mode, ['forward', 'attachments']) &&
($hasSignature || ($hasSignature = preg_match("/^--\s[\r\n]$/",$value))))
{
continue;
}

1
mail/lang/egw_de.lang
View File

@ -493,6 +493,7 @@ reply mail de Antworten
reply all mail de Allen antworten
reply message type mail de Format Ihrer E-Mail beim Antworten/Weiterleiten
reply to mail de Antworten an
reply with attachments mail de Antworten mit Anhängen
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. mail de Die Antwort auf diese Nachricht ist fehlgeschlagen, weil der Inhalt dieser Nachricht verschlüsselt zu sein scheint und nicht richtig entschlüsselt werden kann. Wenn Sie dennoch den Inhalt dieser verschlüsselten Nachricht einbinden möchten, können Sie versuchen, statt dessen Weiterleiten als Anhang zu verwenden.
replyto mail de Antwort an
report as ham mail de Als "gute E-Mail" kennzeichnen

1
mail/lang/egw_en.lang
View File

@ -493,6 +493,7 @@ reply mail en Reply
reply all mail en Reply all
reply message type mail en Reply message type
reply to mail en Reply to
reply with attachments mail en Reply with attachments
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. mail en 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.
replyto mail en replyto
report as ham mail en Report as Ham