* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
require_once 'Mail.php';
$backend = $mail->factory(common_config('mail', 'backend'),
common_config('mail', 'params') ?: array());
if ($_PEAR->isError($backend)) {
- throw new ServerException($backend->getMessage());
+ throw new EmailException($backend->getMessage(), $backend->getCode());
}
}
return $backend;
assert($backend); // throws an error if it's bad
$sent = $backend->send($recipients, $headers, $body);
if ($_PEAR->isError($sent)) {
- throw new ServerException($sent->getMessage());
+ throw new EmailException($sent->getMessage(), $sent->getCode());
}
return true;
} catch (PEAR_Exception $e) {
*
* @return boolean success flag
*/
-function mail_to_user(&$user, $subject, $body, $headers=array(), $address=null)
+function mail_to_user($user, $subject, $body, $headers=array(), $address=null)
{
if (!$address) {
$address = $user->email;
return mail_send($recipients, $headers, $body);
}
-/**
- * Send an email to confirm a user's control of an email address
- *
- * @param User $user User claiming the email address
- * @param string $code Confirmation code
- * @param string $nickname Nickname of user
- * @param string $address email address to confirm
- *
- * @see common_confirmation_code()
- *
- * @return success flag
- */
-function mail_confirm_address($user, $code, $nickname, $address, $url=null)
-{
- if (empty($url)) {
- $url = common_local_url('confirmaddress', array('code' => $code));
- }
-
- // TRANS: Subject for address confirmation email.
- $subject = _('Email address confirmation');
-
- // TRANS: Body for address confirmation email.
- // TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
- // TRANS: %3$s is the URL to confirm at.
- $body = sprintf(_("Hey, %1\$s.\n\n".
- "Someone just entered this email address on %2\$s.\n\n" .
- "If it was you, and you want to confirm your entry, ".
- "use the URL below:\n\n\t%3\$s\n\n" .
- "If not, just ignore this message.\n\n".
- "Thanks for your time, \n%2\$s\n"),
- $nickname,
- common_config('site', 'name'),
- $url);
-
- $headers = array();
-
- return mail_to_user($user, $subject, $body, $headers, $address);
-}
-
/**
* notify a user of subscription by another user
*
/**
* Notify a user that they have received an "attn:" message AKA "@-reply"
*
- * @param User $user The user who recevied the notice
+ * @param Profile $rcpt The Profile who recevied the notice, should be a local user
* @param Notice $notice The notice that was sent
*
* @return void
*/
-function mail_notify_attn($user, $notice)
+function mail_notify_attn(Profile $rcpt, Notice $notice)
{
- if (!$user->receivesEmailNotifications()) {
+ if (!$rcpt->isLocal()) {
return;
}
$sender = $notice->getProfile();
-
- if ($sender->id == $user->id) {
+ if ($rcpt->sameAs($sender)) {
return;
}
}
// If the author has blocked the author, don't spam them with a notification.
- if ($user->hasBlocked($sender)) {
+ if ($rcpt->hasBlocked($sender)) {
return;
}
- $bestname = $sender->getBestName();
+ $user = $rcpt->getUser();
+ if (!$user->receivesEmailNotifications()) {
+ return;
+ }
common_switch_locale($user->language);
if ($notice->hasConversation()) {
$conversationUrl = common_local_url('conversation',
- array('id' => $notice->conversation)).'#notice-'.$notice->id;
+ array('id' => $notice->conversation)).'#notice-'.$notice->getID();
// TRANS: Line in @-reply notification e-mail. %s is conversation URL.
$conversationEmailText = sprintf(_("The full conversation can be read here:\n\n".
"\t%s"), $conversationUrl) . "\n\n";
}
// TRANS: E-mail subject for notice notification.
- // TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
- $subject = sprintf(_('%1$s (@%2$s) sent a notice to your attention'), $bestname, $sender->nickname);
+ // TRANS: %1$s is the "fancy name" for a profile.
+ $subject = sprintf(_('%1$s sent a notice to your attention'), $sender->getFancyName());
// TRANS: Body of @-reply notification e-mail.
// TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
$sender->getFancyName(),//%1
common_config('site', 'name'),//%2
common_local_url('shownotice',
- array('notice' => $notice->id)),//%3
- $notice->content,//%4
+ array('notice' => $notice->getID())),//%3
+ $notice->getContent(),//%4
$conversationEmailText,//%5
common_local_url('newnotice',
- array('replyto' => $sender->nickname, 'inreplyto' => $notice->id)),//%6
+ array('replyto' => $sender->getNickname(), 'inreplyto' => $notice->getID())),//%6
common_local_url('replies',
- array('nickname' => $user->nickname))) . //%7
+ array('nickname' => $rcpt->getNickname()))) . //%7
mail_footer_block();
- $headers = _mail_prepare_headers('mention', $user->nickname, $sender->nickname);
+ $headers = _mail_prepare_headers('mention', $rcpt->getNickname(), $sender->getNickname());
common_switch_locale();
mail_to_user($user, $subject, $body, $headers);