X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=2f30d736c2d252c83eb4293f31ad6a01dd536c1c;hb=fb007082841f1a23da5427063e00ceb7c93f3ac2;hp=53b360e3c0a64f5745c2ecf6919c19dbb64228c1;hpb=97115c846e139bb101bf0b100a0708dd6532f509;p=quix0rs-gnu-social.git

diff --git a/lib/mail.php b/lib/mail.php
index 53b360e3c0..2f30d736c2 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -42,8 +42,10 @@ function mail_send($recipients, $headers, $body) {
 	assert($backend); # throws an error if it's bad
 	$sent = $backend->send($recipients, $headers, $body);
 	if (PEAR::isError($sent)) {
-		common_server_error($sent->getMessage(), 500);
+		common_log(LOG_ERROR, 'Email error: ' . $sent->getMessage());
+		return false;
 	}
+	return true;
 }
 
 function mail_notify_from() {
@@ -55,13 +57,29 @@ function mail_notify_from() {
 	}
 }
 
-# For confirming an email address
+function mail_to_user(&$user, $subject, $body, $address=NULL) {
+	if (!$address) {
+		$address = $user->email;
+	}
+
+	$recipients = $address;
+	$profile = $user->getProfile();
+
+	$headers['From'] = mail_notify_from();
+	$headers['To'] = $profile->getBestName() . ' <' . $address . '>';
+	$headers['Subject'] = $subject;
+
+	return mail_send($recipients, $headers, $body);
+}
+
+# For confirming a Jabber address
+# XXX: change to use mail_to_user() above
 
 function mail_confirm_address($code, $nickname, $address) {
 	$recipients = $address;
 	$headers['From'] = mail_notify_from();
 	$headers['To'] = $nickname . ' <' . $address . '>';
-	$headers['Subject'] = _t('Email address confirmation');
+	$headers['Subject'] = _('Email address confirmation');
 
 	$body = "Hey, $nickname.";
 	$body .= "\n\n";