s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-14 20:17:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'branding' into develop

Browse Source
This commit is contained in:
Xenomporio 2022-06-29 16:30:57 +02:00
commit 502d9c45e5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32449,10 +32449,10 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
// keine leeren email versenden
if($text=="" && $betreff=="") return;
$isSystemTemplate = $system && is_file(dirname(__DIR__, 2) .'/classes/Modules/Company/templates/systemmail.tpl');
/* $isSystemTemplate = $system && is_file(dirname(__DIR__, 2) .'/classes/Modules/Company/templates/systemmail.tpl');
if($isSystemTemplate) {
$signature = false;
}
}*/
if($projekt > 0 && $this->Projektdaten($projekt,"absendeadresse")!=""){
$from = $this->Projektdaten($projekt, "absendeadresse");
@ -32527,6 +32527,7 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
}
// wenn html rahmen
/*
if($isSystemTemplate) {
$email_html_template = file_get_contents(dirname(__DIR__, 2) .'/classes/Modules/Company/templates/systemmail.tpl');
$email_html_template = str_replace(
@ -32534,13 +32535,14 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
str_replace('index.php','',$this->app->Location->getServer()),
$email_html_template
);
}
else{
}
else */
{
$email_html_template = $this->Projektdaten($projekt, "email_html_template");
if($email_html_template == ""){
$email_html_template = $this->Firmendaten('email_html_template');
}
}
}
if($email_html_template!="" && preg_match("/{CONTENT}/",$email_html_template))
{
$email_html_template = preg_replace('~\x{00a0}~siu',' ',$email_html_template);