summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-18 00:12:31 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-18 00:12:31 -0400
commit2ebe1fc61cb71cf9468763b837263e9101151127 (patch)
treefa9691ffb42113ed809631323c91cd901a8341aa
parent42bbd38417ffbfe5bfee669e0c52b50187a3032a (diff)
move mail notification to a utility function
darcs-hash:20080718041231-84dde-5953d417b76ae538fd501db11af9ff4a32bfbc9f.gz
-rw-r--r--actions/subscribe.php21
-rw-r--r--lib/mail.php22
2 files changed, 24 insertions, 19 deletions
diff --git a/actions/subscribe.php b/actions/subscribe.php
index 43506a593..45dffa62b 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -69,28 +69,11 @@ class SubscribeAction extends Action {
function notify($listenee, $listener) {
# XXX: add other notifications (Jabber, SMS) here
# XXX: queue this and handle it offline
+ # XXX: Whatever happens, do it in Twitter-like API, too
$this->notify_email($listenee, $listener);
}
function notify_email($listenee, $listener) {
- if ($listenee->email && $listenee->emailnotifysub) {
- $profile = $listenee->getProfile();
- $other = $listener->getProfile();
- $name = $profile->getBestName();
- $long_name = ($other->fullname) ? ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
- $recipients = $listenee->email;
- $headers['From'] = mail_notify_from();
- $headers['To'] = $name . ' <' . $listenee->email . '>';
- $headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $other->getBestName(),
- common_config('site', 'name'));
- $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
- "\t".'%3$s'."\n\n".
- 'Faithfully yours,'."\n".'%4$s.'."\n"),
- $long_name,
- common_config('site', 'name'),
- $other->profileurl,
- common_config('site', 'name'));
- mail_send($recipients, $headers, $body);
- }
+ mail_subscribe_notify($listenee, $listener);
}
} \ No newline at end of file
diff --git a/lib/mail.php b/lib/mail.php
index 2f30d736c..f01f88e01 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -99,3 +99,25 @@ function mail_confirm_address($code, $nickname, $address) {
mail_send($recipients, $headers, $body);
}
+
+function mail_subscribe_notify($listenee, $listener) {
+ if ($listenee->email && $listenee->emailnotifysub) {
+ $profile = $listenee->getProfile();
+ $other = $listener->getProfile();
+ $name = $profile->getBestName();
+ $long_name = ($other->fullname) ? ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
+ $recipients = $listenee->email;
+ $headers['From'] = mail_notify_from();
+ $headers['To'] = $name . ' <' . $listenee->email . '>';
+ $headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $other->getBestName(),
+ common_config('site', 'name'));
+ $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
+ "\t".'%3$s'."\n\n".
+ 'Faithfully yours,'."\n".'%4$s.'."\n"),
+ $long_name,
+ common_config('site', 'name'),
+ $other->profileurl,
+ common_config('site', 'name'));
+ mail_send($recipients, $headers, $body);
+ }
+}