GX-Bug #59789 » send_mail_fix.patch
| src/system/classes/products/TellAFriendContentView.inc.php (date 1540488021000) | ||
|---|---|---|
| 460 | 460 |
|
| 461 | 461 |
$text_html .= '<br><br>'. GM_TELL_A_FRIEND_EMAIL .': '.$this->email |
| 462 | 462 |
. '<br><br>'.htmlentities_wrapper(GM_TELL_A_FRIEND_MESSAGE) . ': ' . htmlentities_wrapper($message); |
| 463 |
|
|
| 464 |
xtc_php_mail($email, $sender, STORE_OWNER_EMAIL_ADDRESS, STORE_NAME, '', $email, $sender, '', '', GM_TELL_A_FRIEND_SUBJECT_1 . '"'. $this->productName . '"', $text_html, html_entity_decode_wrapper($text)); |
|
| 463 |
|
|
| 464 |
$from_email_address = $email; |
|
| 465 |
if(SEND_EMAIL_BY_BILLING_ADRESS === 'SHOP_OWNER') |
|
| 466 |
{
|
|
| 467 |
$from_email_address = EMAIL_BILLING_ADDRESS; |
|
| 468 |
} |
|
| 469 |
|
|
| 470 |
xtc_php_mail($from_email_address, $sender, STORE_OWNER_EMAIL_ADDRESS, STORE_NAME, '', $email, $sender, '', '', GM_TELL_A_FRIEND_SUBJECT_1 . '"'. $this->productName . '"', $text_html, html_entity_decode_wrapper($text)); |
|
| 465 | 471 |
$this->set_content_data('MAIL_OUT', GM_TELL_A_FRIEND_MAIL_OUT);
|
| 466 | 472 |
} |
| 467 | 473 |
|
| src/system/classes/products/PriceOfferContentView.inc.php (date 1540488012000) | ||
|---|---|---|
| 438 | 438 |
. "\n" . GM_PRICE_OFFER_MAIL_PRICE . ' ' . $this->customer_data_array['price'] |
| 439 | 439 |
. "\n" . GM_PRICE_OFFER_MAIL_OFFERER . ' ' . $this->customer_data_array['offerer'] |
| 440 | 440 |
. "\n\n" . GM_PRICE_OFFER_MAIL_MESSAGE . "\n" . gm_prepare_string($this->customer_data_array['message']); |
| 441 | ||
| 441 |
|
|
| 442 |
$from_email_address = $this->customer_data_array['email']; |
|
| 443 |
if(SEND_EMAIL_BY_BILLING_ADRESS === 'SHOP_OWNER') |
|
| 444 |
{
|
|
| 445 |
$from_email_address = EMAIL_BILLING_ADDRESS; |
|
| 446 |
} |
|
| 447 |
|
|
| 442 | 448 |
// send mail |
| 443 |
xtc_php_mail($this->customer_data_array['email'], $this->customer_data_array['name'], STORE_OWNER_EMAIL_ADDRESS, STORE_NAME, '', $this->customer_data_array['email'], $this->customer_data_array['name'], '', '', GM_PRICE_OFFER_MAIL_SUBJECT . $this->product_data_array['products_name'], nl2br(htmlentities_wrapper($t_mail_content)), $t_mail_content);
|
|
| 449 |
xtc_php_mail($from_email_address, $this->customer_data_array['name'], STORE_OWNER_EMAIL_ADDRESS, STORE_NAME, '', $this->customer_data_array['email'], $this->customer_data_array['name'], '', '', GM_PRICE_OFFER_MAIL_SUBJECT . $this->product_data_array['products_name'], nl2br(htmlentities_wrapper($t_mail_content)), $t_mail_content);
|
|
| 444 | 450 |
$this->content_array['MAIL_OUT'] = GM_PRICE_OFFER_MAIL_OUT; |
| 445 | 451 |
} |
| 446 | 452 |
} |
| src/system/classes/external/ekomi/EkomiManager.inc.php (date 1540488010000) | ||
|---|---|---|
| 286 | 286 |
$t_mail_plain = str_replace('{vorname}', $t_result_array['firstname'], $t_mail_plain);
|
| 287 | 287 |
$t_mail_plain = str_replace('{nachname}', $t_result_array['lastname'], $t_mail_plain);
|
| 288 | 288 |
$t_mail_plain = str_replace('{ekomilink}', $t_result_array['link'], $t_mail_plain);
|
| 289 | ||
| 290 |
$t_mail_sent = xtc_php_mail( $this->v_settings_array['mail_from_email'], |
|
| 289 |
|
|
| 290 |
$from_email_address = $this->v_settings_array['mail_from_email']; |
|
| 291 |
if(SEND_EMAIL_BY_BILLING_ADRESS === 'SHOP_OWNER') |
|
| 292 |
{
|
|
| 293 |
$from_email_address = EMAIL_BILLING_ADDRESS; |
|
| 294 |
} |
|
| 295 |
|
|
| 296 |
$t_mail_sent = xtc_php_mail($from_email_address, |
|
| 291 | 297 |
$this->v_settings_array['mail_from_name'], |
| 292 | 298 |
$t_result_array['email_address'], |
| 293 | 299 |
$t_result_array['firstname'] . ' ' . $t_result_array['lastname'], |