diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php index ac3ff03e..af962630 100644 --- a/www/lib/class.erpapi.php +++ b/www/lib/class.erpapi.php @@ -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);