GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

cleanup whitespace in lib/mail.php

Browse Source 
darcs-hash:20081004174552-5ed1f-058eb6b0b12d96afa9c2cd635467f0fd6ff4e704.gz
This commit is contained in:
Evan Prodromou 2008-10-04 13:45:52 -04:00
parent a5a3548212
commit 3460da32cb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mail.php
View File

@ -191,7 +191,7 @@ function mail_broadcast_notice_sms($notice) {
$user->free(); $user->free();
unset($user); unset($user);
return true; return true;
} }
@ -237,7 +237,7 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
if (is_null($from)) { if (is_null($from)) {
$from = User::staticGet('id', $message->from_profile); $from = User::staticGet('id', $message->from_profile);
} }
if (is_null($to)) { if (is_null($to)) {
$to = User::staticGet('id', $message->to_profile); $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) { if (is_null($to->email) || !$to->emailnotifymsg) {
return true; return true;
} }
$subject = sprintf(_('New private message from %s'), $from->nickname); $subject = sprintf(_('New private message from %s'), $from->nickname);
$from_profile = $from->getProfile(); $from_profile = $from->getProfile();
$body = sprintf(_("%1\$s (%2\$s) sent you a private message:\n\n". $body = sprintf(_("%1\$s (%2\$s) sent you a private message:\n\n".
"------------------------------------------------------\n". "------------------------------------------------------\n".
"%3\$s\n". "%3\$s\n".
@ -264,11 +264,12 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
$message->content, $message->content,
common_local_url('newmessage', array('to' => $from->id)), common_local_url('newmessage', array('to' => $from->id)),
common_config('site', 'name')); common_config('site', 'name'));
return mail_to_user($to, $subject, $body); return mail_to_user($to, $subject, $body);
} }
function mail_notify_fave($other, $user, $notice) { function mail_notify_fave($other, $user, $notice) {
$profile = $user->getProfile(); $profile = $user->getProfile();
$bestname = $profile->getBestName(); $bestname = $profile->getBestName();
$subject = sprintf(_('%s added your notice as a favorite'), $bestname); $subject = sprintf(_('%s added your notice as a favorite'), $bestname);
@ -284,7 +285,6 @@ function mail_notify_fave($other, $user, $notice) {
common_local_url('shownotice', array('notice' => $notice->id)), common_local_url('shownotice', array('notice' => $notice->id)),
common_local_url('showfavorites', array('nickname' => $user->nickname)), common_local_url('showfavorites', array('nickname' => $user->nickname)),
common_config('site', 'name')); common_config('site', 'name'));
mail_to_user($other, $subject, $body); mail_to_user($other, $subject, $body);
} }