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

Fix output of error message. br is no more encoded

Browse Source
This commit is contained in:
Laurent Destailleur 2021-08-21 15:00:47 +02:00
parent ac5b16fd01
commit 49f6a634d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,7 @@ if (!empty($conf->global->$paramcreditorlong)) {
$creditor = $conf->global->$paramcreditor; $creditor = $conf->global->$paramcreditor;
} }
$mesg = '';
/* /*
@ -334,6 +335,7 @@ if (!empty($conf->global->$paramcreditorlong)) {
// Action dopayment is called after clicking/choosing the payment mode // Action dopayment is called after clicking/choosing the payment mode
if ($action == 'dopayment') { if ($action == 'dopayment') {
if ($paymentmethod == 'paypal') { if ($paymentmethod == 'paypal') {
$PAYPAL_API_PRICE = price2num(GETPOST("newamount", 'alpha'), 'MT'); $PAYPAL_API_PRICE = price2num(GETPOST("newamount", 'alpha'), 'MT');
$PAYPAL_PAYMENT_TYPE = 'Sale'; $PAYPAL_PAYMENT_TYPE = 'Sale';
@ -357,7 +359,6 @@ if ($action == 'dopayment') {
$shipToState = 'ID-'.$shipToState; $shipToState = 'ID-'.$shipToState;
} }
$mesg = '';
if (empty($PAYPAL_API_PRICE) || !is_numeric($PAYPAL_API_PRICE)) { if (empty($PAYPAL_API_PRICE) || !is_numeric($PAYPAL_API_PRICE)) {
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")); $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
$action = ''; $action = '';
@ -421,7 +422,6 @@ if ($action == 'dopayment') {
$urlok = preg_replace('/securekey=[^&]+/', '', $urlok); $urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
$urlko = preg_replace('/securekey=[^&]+/', '', $urlko); $urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
$mesg = '';
if (empty($PRICE) || !is_numeric($PRICE)) { if (empty($PRICE) || !is_numeric($PRICE)) {
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")); $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
} elseif (empty($email)) { } elseif (empty($email)) {
@ -1984,7 +1984,7 @@ if (!$found && !$mesg) {
} }
if ($mesg) { if ($mesg) {
print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n"; print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg, 1, 1, 'br').'</div></td></tr>'."\n";
} }
print '</table>'."\n"; print '</table>'."\n";