extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-28 22:01:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed messed up signature changing from / mail-accounts

Browse Source 
also fixed some undefined warnings
This commit is contained in:
ralf 2022-05-02 17:19:37 +02:00
parent 3777ba7691
commit df938c79de
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Mail.php
View File

@ -5514,7 +5514,7 @@ class Mail
continue; continue;
} }
if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = Translation::detect_encoding($singleBodyPart['body']); if (empty($singleBodyPart['charSet'])) $singleBodyPart['charSet'] = Translation::detect_encoding($singleBodyPart['body']);
$singleBodyPart['body'] = Translation::convert( $singleBodyPart['body'] = Translation::convert(
$singleBodyPart['body'], $singleBodyPart['body'],
strtolower($singleBodyPart['charSet']) strtolower($singleBodyPart['charSet'])

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

@ -671,7 +671,7 @@ class mail_compose
$content['body'] = $content['body'] ?? $content['mail_'.($content['mimeType'] === 'html'?'html':'plain').'text'] ?? $content['body'] = $content['body'] ?? $content['mail_'.($content['mimeType'] === 'html'?'html':'plain').'text'] ??
($content['mimeType'] === 'html' ? '<br>' : ''); ($content['mimeType'] === 'html' ? '<br>' : '');
unset($_content['body'], $_content['mail_htmltext'], $_content['mail_plaintext']); unset($_content['body'], $_content['mail_htmltext'], $_content['mail_plaintext']);
$_currentMode = $_content['mimeType']; $_currentMode = $_content['mimeType'] && $_content['mimeType'] !== 'plain' ? 'html' : 'plain';
// we have to keep comments to be able to changing signatures // we have to keep comments to be able to changing signatures
// signature is wraped in "<!-- HTMLSIGBEGIN -->$signature<!-- HTMLSIGEND -->" // signature is wraped in "<!-- HTMLSIGBEGIN -->$signature<!-- HTMLSIGEND -->"
@ -707,7 +707,7 @@ class mail_compose
if ($_oldSig != $_signatureid) if ($_oldSig != $_signatureid)
{ {
if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']); if(Mail::$debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
// prepare signatures, the selected sig may be used on top of the body // prepare signatures, the selected sig may be used on top of the body
try try
{ {
@ -737,7 +737,7 @@ class mail_compose
{ {
$oldSigText = $this->convertHTMLToText($oldSigText,true,true); $oldSigText = $this->convertHTMLToText($oldSigText,true,true);
$sigText = $this->convertHTMLToText($sigText,true,true); $sigText = $this->convertHTMLToText($sigText,true,true);
if($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText); if(Mail::$debug) error_log(__METHOD__." Old signature:".$oldSigText);
} }
//$oldSigText = Mail::merge($oldSigText,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id'))); //$oldSigText = Mail::merge($oldSigText,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
@ -798,8 +798,8 @@ class mail_compose
if ($found === false) if ($found === false)
{ {
if($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned); if(Mail::$debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
if($this->_debug) error_log(__METHOD__." Compare content:".$content['body']); if(Mail::$debug) error_log(__METHOD__." Compare content:".$content['body']);
} }
else else
{ {