Fix fulltag

This commit is contained in:
Laurent Destailleur 2018-01-30 11:24:02 +01:00
parent 06f2382e39
commit be874f0b1d
4 changed files with 12 additions and 5 deletions

View File

@ -126,6 +126,7 @@ $result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf)
if ($result < 0) { $error++; $errors=$interface->errors; } if ($result < 0) { $error++; $errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
// Send an email // Send an email
if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
@ -152,7 +153,6 @@ if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
$urlback=$_SERVER["REQUEST_URI"]; $urlback=$_SERVER["REQUEST_URI"];
$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived"); $topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
$content=""; $content="";
if (! empty($tmptag['MEM'])) if (! empty($tmptag['MEM']))
{ {

View File

@ -188,7 +188,7 @@ if (! empty($conf->paypal->enabled))
if ($PAYPALTOKEN) if ($PAYPALTOKEN)
{ {
// Get on url call // Get on url call
$onlinetoken = $PAYPALTOKEN; $onlinetoken = $PAYPALTOKEN;
$fulltag = $FULLTAG; $fulltag = $FULLTAG;
$payerID = $PAYPALPAYERID; $payerID = $PAYPALPAYERID;
// Set by newpayment.php // Set by newpayment.php
@ -291,6 +291,8 @@ if ($ispaymentok)
$sendemail = ''; $sendemail = '';
if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL; if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
// Send an email // Send an email
if ($sendemail) if ($sendemail)
{ {
@ -316,7 +318,6 @@ if ($ispaymentok)
$urlback=$_SERVER["REQUEST_URI"]; $urlback=$_SERVER["REQUEST_URI"];
$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived"); $topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
$content=""; $content="";
if (! empty($tmptag['MEM'])) if (! empty($tmptag['MEM']))
{ {
@ -388,6 +389,8 @@ else
if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL; if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
if ($paymentmethod == 'stripe' && ! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL; if ($paymentmethod == 'stripe' && ! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
// Send an email // Send an email
if ($sendemail) if ($sendemail)
{ {

View File

@ -181,6 +181,8 @@ if ($PAYPALTOKEN)
if ($result < 0) { $error++; $errors=$interface->errors; } if ($result < 0) { $error++; $errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
// Send an email // Send an email
if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
{ {
@ -206,7 +208,6 @@ if ($PAYPALTOKEN)
$urlback=$_SERVER["REQUEST_URI"]; $urlback=$_SERVER["REQUEST_URI"];
$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived"); $topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
$content=""; $content="";
if (! empty($tmptag['MEM'])) if (! empty($tmptag['MEM']))
{ {
@ -265,6 +266,8 @@ if ($PAYPALTOKEN)
if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n"; if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
// Send an email // Send an email
if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
{ {

View File

@ -127,6 +127,8 @@ if ($ispaymentok)
$sendemail = ''; $sendemail = '';
if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL; if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
// Send an email // Send an email
if ($sendemail) if ($sendemail)
{ {
@ -152,7 +154,6 @@ if ($ispaymentok)
$urlback=$_SERVER["REQUEST_URI"]; $urlback=$_SERVER["REQUEST_URI"];
$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived"); $topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
$content=""; $content="";
if (! empty($tmptag['MEM'])) if (! empty($tmptag['MEM']))
{ {