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

diff --git a/lib/mail.php b/lib/mail.php
index 6656964abc..ef33b2127b 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -22,8 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once('Mail.php');
 
 function mail_backend() {
-	static $backend = NULL; 
-	
+	static $backend = NULL;
+
 	if (!$backend) {
 		global $config;
 		$backend = Mail::factory($config['mail']['backend'],
@@ -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() {
@@ -51,7 +53,49 @@ function mail_notify_from() {
 	if ($config['mail']['notifyfrom']) {
 		return $config['mail']['notifyfrom'];
 	} else {
-		return 'Do Not Reply <nobody@'.$config['site']['server'].'>';
+		return $config['site']['name'] . ' <noreply@'.$config['site']['server'].'>';
+	}
+}
+
+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');
+
+	$body = "Hey, $nickname.";
+	$body .= "\n\n";
+	$body .= 'Someone just entered this email address on ' . common_config('site', 'name') . '.';
+	$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('confirmaddress',
+								   array('code' => $code));
+	$body .= "\n\n";
+	$body .= 'If not, just ignore this message.';
+	$body .= "\n\n";
+	$body .= 'Thanks for your time, ';
+	$body .= "\n";
+	$body .= common_config('site', 'name');
+	$body .= "\n";
+
+	mail_send($recipients, $headers, $body);
 }
- 
\ No newline at end of file