X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=ef33b2127b76e0c565b1b0f06d1784dd54553a63;hb=5527d6b5359a022256e91c258c78d2881ef9f086;hp=c1332ab2ba8240b8d7f9cfdfbafc195093e9d6d6;hpb=f72329a13d7061e891e8b778abe76408166346a9;p=quix0rs-gnu-social.git

diff --git a/lib/mail.php b/lib/mail.php
index c1332ab2ba..ef33b2127b 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,7 +57,23 @@ 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;
@@ -69,7 +87,7 @@ function mail_confirm_address($code, $nickname, $address) {
 	$body .= "\n\n";
 	$body .= 'If it was you, and you want to confirm your entry, use the URL below:';
 	$body .= "\n\n";
-	$body .= "\t".common_local_url('confirmemail',
+	$body .= "\t".common_local_url('confirmaddress',
 								   array('code' => $code));
 	$body .= "\n\n";
 	$body .= 'If not, just ignore this message.';