X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=b96bc7161db07c3d8e0fe026f0c59e07b3579579;hb=8deac7248e7db35515d7810491f9136deffa3098;hp=9a04aabcbd4ad04da183a829974828e3a2bc2076;hpb=8957f9cf894973c2ef75b74e0e475ec37d9cb989;p=quix0rs-gnu-social.git diff --git a/lib/mail.php b/lib/mail.php index 9a04aabcbd..b96bc7161d 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -191,7 +191,7 @@ function mail_broadcast_notice_sms($notice) { $user->free(); unset($user); - + return true; } @@ -237,7 +237,7 @@ function mail_notify_message($message, $from=NULL, $to=NULL) { if (is_null($from)) { $from = User::staticGet('id', $message->from_profile); } - + if (is_null($to)) { $to = User::staticGet('id', $message->to_profile); } @@ -245,11 +245,11 @@ function mail_notify_message($message, $from=NULL, $to=NULL) { if (is_null($to->email) || !$to->emailnotifymsg) { return true; } - + $subject = sprintf(_('New private message from %s'), $from->nickname); $from_profile = $from->getProfile(); - + $body = sprintf(_("%1\$s (%2\$s) sent you a private message:\n\n". "------------------------------------------------------\n". "%3\$s\n". @@ -257,13 +257,34 @@ function mail_notify_message($message, $from=NULL, $to=NULL) { "You can reply to their message here:\n\n". "%4\$s\n\n". "Don't reply to this email; it won't get to them.\n\n". - "With kind regards,\n", + "With kind regards,\n". "%5\$s\n"), $from_profile->getBestName(), $from->nickname, $message->content, common_local_url('newmessage', array('to' => $from->id)), common_config('site', 'name')); - + return mail_to_user($to, $subject, $body); } + +function mail_notify_fave($other, $user, $notice) { + + $profile = $user->getProfile(); + $bestname = $profile->getBestName(); + $subject = sprintf(_('%s added your notice as a favorite'), $bestname); + $body = sprintf(_("%1\$s just added your notice from %2\$s as one of their favorites.\n\n" . + "In case you forgot, you can see the text of your notice here:\n\n" . + "%3\$s\n\n" . + "You can see the list of %1\$s's favorites here:\n\n" . + "%4\$s\n\n" . + "Faithfully yours,\n" . + "%5\$s\n"), + $bestname, + common_exact_date($notice->created), + common_local_url('shownotice', array('notice' => $notice->id)), + common_local_url('showfavorites', array('nickname' => $user->nickname)), + common_config('site', 'name')); + + mail_to_user($other, $subject, $body); +}