From 736e1bd5069476c2a3f0a1e27b206c0605749b67 Mon Sep 17 00:00:00 2001 From: Xenomporio <> Date: Wed, 29 Jun 2022 16:30:11 +0200 Subject: [PATCH] Debranded test email --- www/lib/class.erpapi.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php index 5f339965..b78a1580 100644 --- a/www/lib/class.erpapi.php +++ b/www/lib/class.erpapi.php @@ -32517,10 +32517,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; - } + }*/ $from_name = $this->ClearDataBeforeOutput($from_name); $to_name = $this->ClearDataBeforeOutput($to_name); @@ -32637,6 +32637,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( @@ -32644,13 +32645,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);