From c9ee729e2f7cea181c075a1cd62b899886d944bd Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Sun, 24 Jan 2010 18:26:15 +0200 Subject: [PATCH] Feature #272 - Cosmetics in mail functions. --- main/inc/lib/mail.lib.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/mail.lib.inc.php b/main/inc/lib/mail.lib.inc.php index 3b46ea51cb..88b03abdca 100755 --- a/main/inc/lib/mail.lib.inc.php +++ b/main/inc/lib/mail.lib.inc.php @@ -57,8 +57,8 @@ function api_mail($recipient_name, $recipient_email, $subject, $message, $sender } else { - $mail->From = $platform_email['SMTP_FROM_EMAIL']; - $mail->Sender = $platform_email['SMTP_FROM_EMAIL']; + $mail->From = $platform_email['SMTP_FROM_EMAIL']; + $mail->Sender = $platform_email['SMTP_FROM_EMAIL']; //$mail->ConfirmReadingTo = $platform_email['SMTP_FROM_EMAIL']; //Disposition-Notification } @@ -72,6 +72,7 @@ function api_mail($recipient_name, $recipient_email, $subject, $message, $sender } $mail->Subject = $subject; $mail->Body = $message; + //only valid address if(eregi( $regexp, $recipient_email )) { @@ -149,8 +150,8 @@ function api_mail_html($recipient_name, $recipient_email, $subject, $message, $s } else { - $mail->From = $platform_email['SMTP_FROM_EMAIL']; - $mail->Sender = $platform_email['SMTP_FROM_EMAIL']; + $mail->From = $platform_email['SMTP_FROM_EMAIL']; + $mail->Sender = $platform_email['SMTP_FROM_EMAIL']; //$mail->ConfirmReadingTo = $platform_email['SMTP_FROM_EMAIL']; //Disposition-Notification }