From 7d2f904174f4a15e2807dc2048f618726e806264 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 9 Jun 2013 12:47:44 +0200 Subject: [PATCH] Fix: Option MEMBER_PAYONLINE_SENDEMAIL was not working --- htdocs/public/paybox/paymentko.php | 6 +++--- htdocs/public/paybox/paymentok.php | 6 +++--- htdocs/public/paypal/paymentko.php | 6 +++--- htdocs/public/paypal/paymentok.php | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php index c4457ff4d93..de05e2a4ac1 100644 --- a/htdocs/public/paybox/paymentko.php +++ b/htdocs/public/paybox/paymentko.php @@ -64,7 +64,7 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox'); // Send an email -if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag)) +if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag)) { $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL; $from=$conf->global->MAILING_EMAIL_FROM; @@ -79,11 +79,11 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu $result=$mailfile->sendfile(); if ($result) { - dol_syslog("EMail sent to ".$sendto); + dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox'); } else { - dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR); + dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox'); } } diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php index b8940fa1a32..6af144c353c 100644 --- a/htdocs/public/paybox/paymentok.php +++ b/htdocs/public/paybox/paymentok.php @@ -94,7 +94,7 @@ dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." */ // Send an email -if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag)) +if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag)) { $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL; $from=$conf->global->MAILING_EMAIL_FROM; @@ -109,11 +109,11 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu $result=$mailfile->sendfile(); if ($result) { - dol_syslog("EMail sent to ".$sendto); + dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox'); } else { - dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR); + dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox'); } } diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php index 21d93f3eaa1..69fa80eb9cb 100755 --- a/htdocs/public/paypal/paymentko.php +++ b/htdocs/public/paypal/paymentko.php @@ -72,7 +72,7 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal'); // Send an email -if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag)) +if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag)) { $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL; $from=$conf->global->MAILING_EMAIL_FROM; @@ -87,11 +87,11 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu $result=$mailfile->sendfile(); if ($result) { - dol_syslog("EMail sent to ".$sendto); + dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal'); } else { - dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR); + dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal'); } } diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index e4ea8a92095..5e822fd75d1 100755 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -127,11 +127,11 @@ if ($PAYPALTOKEN) // From env $ipaddress = $_SESSION['ipaddress']; - dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag); + dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal'); // Send an email - if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag)) + if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag)) { $sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL; $from=$conf->global->MAILING_EMAIL_FROM; @@ -146,11 +146,11 @@ if ($PAYPALTOKEN) $result=$mailfile->sendfile(); if ($result) { - dol_syslog("EMail sent to ".$sendto); + dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal'); } else { - dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR); + dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal'); } } @@ -158,11 +158,11 @@ if ($PAYPALTOKEN) // Validate record if (! empty($paymentType)) { - dol_syslog("We call GetExpressCheckoutDetails"); + dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_paypal'); $resArray=getDetails($token); //var_dump($resarray); - dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag); + dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal'); $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag); $ack = strtoupper($resArray["ACK"]);