add extra Twitter cruft to jabber messages

[quix0rs-gnu-social.git] / lib / mail.php

diff --git a/lib/mail.php b/lib/mail.php
index c1332ab2ba8240b8d7f9cfdfbafc195093e9d6d6..2f30d736c2d252c83eb4293f31ad6a01dd536c1c 100644 (file)
--- 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";
@@ -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.';