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

Bugfix ticket email draft, set sender and sendername later when sending

Browse Source
This commit is contained in:
OpenXE 2023-01-12 17:58:54 +01:00
parent c9a24e7f75
commit 99eed95d85
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/pages/ticket.php
View File

@ -680,9 +680,6 @@ class Ticket {
$this->app->Tpl->Set('EMAIL_AN', htmlentities($recv_messages[0]['mail'])); $this->app->Tpl->Set('EMAIL_AN', htmlentities($recv_messages[0]['mail']));
$senderName = $this->app->User->GetName()." (".$this->app->erp->GetFirmaAbsender().")";
$senderAddress = $this->app->erp->GetFirmaMail();
$to = ""; $to = "";
$cc = ""; $cc = "";
@ -783,12 +780,15 @@ class Ticket {
$cc = null; $cc = null;
} }
$senderName = $this->app->User->GetName()." (".$this->app->erp->GetFirmaAbsender().")";
$senderAddress = $this->app->erp->GetFirmaMail();
// function MailSend($from,$from_name,$to,$to_name,$betreff,$text,$files="",$projekt="",$signature=true,$cc="",$bcc="", $system = false) // function MailSend($from,$from_name,$to,$to_name,$betreff,$text,$files="",$projekt="",$signature=true,$cc="",$bcc="", $system = false)
if ( if (
$this->app->erp->MailSend( $this->app->erp->MailSend(
$drafted_messages[0]['mail_replyto'], $senderAddress,
$drafted_messages[0]['verfasser_replyto'], $senderName,
$to, $to,
$to, $to,
htmlentities($drafted_messages[0]['betreff']), htmlentities($drafted_messages[0]['betreff']),
@ -803,7 +803,7 @@ class Ticket {
) { ) {
// Update message in ticket_nachricht // Update message in ticket_nachricht
$sql = "UPDATE `ticket_nachricht` SET `zeitausgang` = NOW(), `betreff` = '".$drafted_messages[0]['betreff']."' WHERE id = ".$drafted_messages[0]['id']; $sql = "UPDATE `ticket_nachricht` SET `zeitausgang` = NOW(), `betreff` = '".$drafted_messages[0]['betreff']."', `verfasser` = '$senderName', `verfasser_replyto` = '$senderName', `mail_replyto` = '$senderAddress' WHERE id = ".$drafted_messages[0]['id'];
$this->app->DB->Insert($sql); $this->app->DB->Insert($sql);
$msg .= '<div class="info">Die E-Mail wurde erfolgreich versendet an '.$input['email_an'].'.'; $msg .= '<div class="info">Die E-Mail wurde erfolgreich versendet an '.$input['email_an'].'.';