lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW send context and remove new lines on create ticket

Browse Source
This commit is contained in:
lvessiller 2020-09-03 17:22:27 +02:00
parent 457342ee95
commit a4f1ddaad0
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
View File

@ -198,7 +198,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
/* Send email to admin */
$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
$message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
$message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
@ -217,14 +217,16 @@ class InterfaceTicketEmail extends DolibarrTriggers
$message_admin .= '<p>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</p>';
}
$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
$message = $object->message;
if (!dol_textishtml($message)) {
$message = dol_nl2br($message);
}
$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$message.'</p>';
$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
$replyto = $from;
$message_admin = dol_nl2br($message_admin);
$trackid = 'tic'.$object->id;
if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
@ -232,7 +234,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
}
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
if ($mailfile->error) {
dol_syslog($mailfile->error, LOG_DEBUG);
} else {
@ -263,7 +265,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
$mimetype = array();
$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
$message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
$message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id).'<br><br>';
$message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
$message_customer .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
$message_customer .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
@ -291,7 +293,12 @@ class InterfaceTicketEmail extends DolibarrTriggers
}
$message_customer .= '</ul>';
$message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
$message = $object->message;
if (!dol_textishtml($message)) {
$message = dol_nl2br($message);
}
$message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$message.'</p>';
$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
$message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
@ -299,8 +306,6 @@ class InterfaceTicketEmail extends DolibarrTriggers
$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
$replyto = $from;
$message_customer = dol_nl2br($message_customer);
$trackid = 'tic'.$object->id;
if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
@ -308,7 +313,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
}
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', $trackid);
$mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
if ($mailfile->error) {
dol_syslog($mailfile->error, LOG_DEBUG);
} else {

24
htdocs/ticket/class/ticket.class.php
View File

@ -2539,7 +2539,11 @@ class Ticket extends CommonObject
// Message send
$message = $langs->trans('TicketMessageMailIntroText');
$message .= '<br><br>';
$message .= GETPOST('message', 'none');
$messagePost = GETPOST('message', 'restricthtml');
if (!dol_textishtml($messagePost)) {
$messagePost = dol_nl2br($messagePost);
}
$message .= $messagePost;
// Customer company infos
$message .= '<br><br>';
@ -2588,7 +2592,11 @@ class Ticket extends CommonObject
$message = $langs->trans('TicketMessageMailIntroText');
$message .= '<br><br>';
$message .= GETPOST('message', 'restricthtml');
$messagePost = GETPOST('message', 'restricthtml');
if (!dol_textishtml($messagePost)) {
$messagePost = dol_nl2br($messagePost);
}
$message .= $messagePost;
// Coordonnées client
$message .= '<br><br>';
@ -2657,9 +2665,19 @@ class Ticket extends CommonObject
$message_intro = GETPOST('mail_intro') ? GETPOST('mail_intro', 'restricthtml') : $conf->global->TICKET_MESSAGE_MAIL_INTRO;
$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature', 'restricthtml') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
if (!dol_textishtml($message_intro)) {
$message_intro = dol_nl2br($message_intro);
}
if (!dol_textishtml($message_signature)) {
$message_signature = dol_nl2br($message_signature);
}
// We put intro after
$message = GETPOST('message', 'restricthtml');
$messagePost = GETPOST('message', 'restricthtml');
if (!dol_textishtml($messagePost)) {
$messagePost = dol_nl2br($messagePost);
}
$message = $messagePost;
$message .= '<br><br>';
foreach ($external_contacts as $key => $info_sendto) {