s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

mailsend bugfix UTF-8

Browse Source
This commit is contained in:
OpenXE 2024-01-30 11:13:07 +01:00
parent 2dcc5b664e
commit 2b29457763
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/lib/class.erpapi.php
View File

@ -25530,31 +25530,31 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
{ {
$signaturtext = $this->Signatur($from); $signaturtext = $this->Signatur($from);
if($this->isHTML($signaturtext)) if($this->isHTML($signaturtext))
$body = utf8_decode(str_replace('\r\n',"\n",$text))."<br>".$signaturtext; $body = str_replace('\r\n',"\n",$text)."<br>".$signaturtext;
else else
$body = utf8_decode(str_replace('\r\n',"\n",$text))."<br>".nl2br($signaturtext); $body = str_replace('\r\n',"\n",$text)."<br>".nl2br($signaturtext);
}else{ }else{
if($projekt > 0 && $this->Projektdaten($projekt,"absendesignatur")!=""){ if($projekt > 0 && $this->Projektdaten($projekt,"absendesignatur")!=""){
$signaturtext = $this->Projektdaten($projekt,"absendesignatur"); $signaturtext = $this->Projektdaten($projekt,"absendesignatur");
if($this->isHTML($signaturtext)) if($this->isHTML($signaturtext))
$body = utf8_decode(str_replace('\r\n',"\n",$text))."<br><br>".$signaturtext; $body = str_replace('\r\n',"\n",$text)."<br><br>".$signaturtext;
else else
$body = utf8_decode(str_replace('\r\n',"\n",$text))."<br><br>".$this->ReadyForPDF(nl2br($signaturtext)); $body = str_replace('\r\n',"\n",$text)."<br><br>".$this->ReadyForPDF(nl2br($signaturtext));
}else{ }else{
if(strlen(trim($this->Signatur($from))) > 0 && $eigenesignatur == 0){ if(strlen(trim($this->Signatur($from))) > 0 && $eigenesignatur == 0){
$signaturtext = $this->Signatur($from); $signaturtext = $this->Signatur($from);
if($this->isHTML($signaturtext)) if($this->isHTML($signaturtext))
$body = str_replace('\r\n',"\n",$text)."<br>".$signaturtext; $body = str_replace('\r\n',"\n",$text)."<br>".$signaturtext;
else else
$body = utf8_decode(str_replace('\r\n',"\n",$text))."<br>".nl2br($signaturtext); $body = str_replace('\r\n',"\n",$text)."<br>".nl2br($signaturtext);
}else{ }else{
$body = utf8_decode(str_replace('\r\n',"\n",$text)); $body = str_replace('\r\n',"\n",$text);
} }
} }
} }
} else { } else {
$body = utf8_decode(str_replace('\r\n',"\n",$text)); $body = str_replace('\r\n',"\n",$text);
} }
{ {