vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX trackid and temp dir on payment confirmation of event registration

Browse source
This commit is contained in:
Laurent Destailleur 2024-03-18 20:02:08 +01:00
parent 0b8d6dfae6
commit a0b7cb90d8
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/core/class/CMailFile.class.php
View file

@ -1901,9 +1901,15 @@ class CMailFile
*/
private function findHtmlImagesIsSrcData($images_dir)
{
global $conf;
// Build the array of image extensions
$extensions = array_keys($this->image_types);
if (empty($images_dir)) {
$images_dir = $conf->admin->dir_output.'/temp/'.uniqid('cmailfile');
}
if ($images_dir && !dol_is_dir($images_dir)) {
dol_mkdir($images_dir, DOL_DATA_ROOT);
}

18
htdocs/public/payment/paymentok.php
View file

@ -1378,7 +1378,9 @@ if ($ispaymentok) {
$listofmimes = array(dol_mimetype($file));
}
$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, $cc, '', 0, $ishtml);
$trackid = 'inv'.$object->id;
$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, $cc, '', 0, $ishtml, '', '', $trackid, '', 'standard');
$result = $mailfile->sendfile();
if ($result) {
@ -1569,8 +1571,9 @@ if ($ispaymentok) {
$urlback = $_SERVER["REQUEST_URI"];
$ishtml = dol_textishtml($texttosend); // May contain urls
$trackid = 'inv'.$invoice->id;
$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml, '', '', $trackid, '', 'standard');
$result = $mailfile->sendfile();
if ($result) {
@ -1777,10 +1780,7 @@ if ($ispaymentok) {
print $conf->global->$key;
}
$sendemail = '';
if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
$sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
}
$sendemail = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL');
$tmptag = dolExplodeIntoArray($fulltag, '.', '=');
@ -1860,9 +1860,10 @@ if ($ispaymentok) {
$ishtml = dol_textishtml($content); // May contain urls
$trackid = '';
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml, '', '', $trackid, '', 'standard');
$result = $mailfile->sendfile();
if ($result) {
@ -1941,9 +1942,10 @@ if ($ispaymentok) {
$ishtml = dol_textishtml($content); // May contain urls
$trackid = '';
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml, '', '', $trackid, '', 'standard');
$result = $mailfile->sendfile();
if ($result) {