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

Debranded test email

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

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

@ -32517,10 +32517,10 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
// keine leeren email versenden // keine leeren email versenden
if($text=="" && $betreff=="") return; 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) { if($isSystemTemplate) {
$signature = false; $signature = false;
} }*/
$from_name = $this->ClearDataBeforeOutput($from_name); $from_name = $this->ClearDataBeforeOutput($from_name);
$to_name = $this->ClearDataBeforeOutput($to_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 // wenn html rahmen
/*
if($isSystemTemplate) { if($isSystemTemplate) {
$email_html_template = file_get_contents(dirname(__DIR__, 2) .'/classes/Modules/Company/templates/systemmail.tpl'); $email_html_template = file_get_contents(dirname(__DIR__, 2) .'/classes/Modules/Company/templates/systemmail.tpl');
$email_html_template = str_replace( $email_html_template = str_replace(
@ -32645,7 +32646,8 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
$email_html_template $email_html_template
); );
} }
else{ else */
{
$email_html_template = $this->Projektdaten($projekt, "email_html_template"); $email_html_template = $this->Projektdaten($projekt, "email_html_template");
if($email_html_template == ""){ if($email_html_template == ""){
$email_html_template = $this->Firmendaten('email_html_template'); $email_html_template = $this->Firmendaten('email_html_template');