We should probably get rid of this function, at least storing everything in
lib/mail.php - but until then, at least let's make it more understandable.
$recipientIds = $this->getReplies();
if (Event::handle('StartNotifyMentioned', array($this, &$recipientIds))) {
$recipientIds = $this->getReplies();
if (Event::handle('StartNotifyMentioned', array($this, &$recipientIds))) {
+ require_once INSTALLDIR.'/lib/mail.php';
+
foreach ($recipientIds as $recipientId) {
$user = User::getKV('id', $recipientId);
if ($user instanceof User) {
foreach ($recipientIds as $recipientId) {
$user = User::getKV('id', $recipientId);
if ($user instanceof User) {
* want to receive notification of faves. Maybe this happens higher
* up the stack...?
*
* want to receive notification of faves. Maybe this happens higher
* up the stack...?
*
- * @param User $other The user whose notice was faved
- * @param User $user The user who faved the notice
- * @param Notice $notice The notice that was faved
+ * @param User $rcpt The user whose notice was faved
+ * @param Profile $sender The user who faved the notice
+ * @param Notice $notice The notice that was faved
-function mail_notify_fave($other, $user, $notice)
+function mail_notify_fave(User $rcpt, Profile $sender, Notice $notice)
- if (!$user->hasRight(Right::EMAILONFAVE)) {
+ if (!$sender->hasRight(Right::EMAILONFAVE)) {
- $profile = $user->getProfile();
- if ($other->hasBlocked($profile)) {
+ if ($rcpt->hasBlocked($sender)) {
// If the author has blocked us, don't spam them with a notification.
return;
}
$bestname = $profile->getBestName();
// If the author has blocked us, don't spam them with a notification.
return;
}
$bestname = $profile->getBestName();
- common_switch_locale($other->language);
+ common_switch_locale($rcpt->language);
// TRANS: Subject for favorite notification e-mail.
// TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
// TRANS: Subject for favorite notification e-mail.
// TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
- $subject = sprintf(_('%1$s (@%2$s) added your notice as a favorite'), $bestname, $user->nickname);
+ $subject = sprintf(_('%1$s (@%2$s) added your notice as a favorite'), $bestname, $sender->getNickname());
// TRANS: Body for favorite notification e-mail.
// TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
// TRANS: Body for favorite notification e-mail.
// TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
array('notice' => $notice->id)),
$notice->content,
common_local_url('showfavorites',
array('notice' => $notice->id)),
$notice->content,
common_local_url('showfavorites',
- array('nickname' => $user->nickname)),
+ array('nickname' => $sender->getNickname())),
common_config('site', 'name'),
common_config('site', 'name'),
+ $sender->getNickname()) .
- $headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname);
+ $headers = _mail_prepare_headers('fave', $rcpt->getNickname(), $sender->getNickname());
- mail_to_user($other, $subject, $body, $headers);
+ mail_to_user($rcpt, $subject, $body, $headers);
$other = User::getKV('id', $notice->profile_id);
if ($other && $other->id != $user->id) {
if ($other->email && $other->emailnotifyfav) {
$other = User::getKV('id', $notice->profile_id);
if ($other && $other->id != $user->id) {
if ($other->email && $other->emailnotifyfav) {
- mail_notify_fave($other, $user, $notice);
+ require_once INSTALLDIR.'/lib/mail.php';
+
+ mail_notify_fave($other, $user->getProfile(), $notice);
}
// XXX: notify by IM
// XXX: notify by SMS
}
// XXX: notify by IM
// XXX: notify by SMS
$other = User::getKV('id', $notice->profile_id);
if ($other && $other->id != $user->id) {
if ($other->email && $other->emailnotifyfav) {
$other = User::getKV('id', $notice->profile_id);
if ($other && $other->id != $user->id) {
if ($other->email && $other->emailnotifyfav) {
- mail_notify_fave($other, $user, $notice);
+ require_once INSTALLDIR.'/lib/mail.php';
+
+ mail_notify_fave($other, $user->getProfile(), $notice);
}
// XXX: notify by IM
// XXX: notify by SMS
}
// XXX: notify by IM
// XXX: notify by SMS
if ($other && $other->id != $this->user->id) {
if ($other->email && $other->emailnotifyfav) {
if ($other && $other->id != $this->user->id) {
if ($other->email && $other->emailnotifyfav) {
- mail_notify_fave($other, $this->user, $notice);
+ require_once INSTALLDIR.'/lib/mail.php';
+
+ mail_notify_fave($other, $this->user->getProfile(), $notice);