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

Merge branch 'Dolibarr:16.0' into 16.0

Browse Source
This commit is contained in:
Sébastien NASSIET 2023-01-11 21:07:31 +01:00 committed by GitHub
commit 2bce74d2e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/public/payment/paymentko.php
View File

@ -173,7 +173,7 @@ if (!empty($_SESSION['ipaddress'])) { // To avoid to make action twice
$companylangs->setDefaultLang($mysoc->default_lang); $companylangs->setDefaultLang($mysoc->default_lang);
$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox')); $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
$from = $conf->global->MAILING_EMAIL_FROM; $from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
$sendto = $sendemail; $sendto = $sendemail;
$urlback = $_SERVER["REQUEST_URI"]; $urlback = $_SERVER["REQUEST_URI"];

6
htdocs/public/payment/paymentok.php
View File

@ -1299,7 +1299,7 @@ if ($ispaymentok) {
$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs); $texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
$sendto = $attendeetovalidate->email; $sendto = $attendeetovalidate->email;
$from = $conf->global->MAILING_EMAIL_FROM; $from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
$urlback = $_SERVER["REQUEST_URI"]; $urlback = $_SERVER["REQUEST_URI"];
$ishtml = dol_textishtml($texttosend); // May contain urls $ishtml = dol_textishtml($texttosend); // May contain urls
@ -1596,7 +1596,7 @@ if ($ispaymentok) {
$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox')); $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
$sendto = $sendemail; $sendto = $sendemail;
$from = $conf->global->MAILING_EMAIL_FROM; $from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
// Define $urlwithroot // Define $urlwithroot
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
@ -1724,7 +1724,7 @@ if ($ispaymentok) {
$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox')); $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
$sendto = $sendemail; $sendto = $sendemail;
$from = $conf->global->MAILING_EMAIL_FROM; $from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
// Define $urlwithroot // Define $urlwithroot
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file