move mail notification to a utility function

darcs-hash:20080718041231-84dde-5953d417b76ae538fd501db11af9ff4a32bfbc9f.gz

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 43506a593dd7d1eca17e65011a373aac27209fa9..45dffa62bc6e00612e71c5ba280aa448ebc4f6d4 100644 (file)
--- 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 2f30d736c2d252c83eb4293f31ad6a01dd536c1c..f01f88e014875502c434b1b234b33a4f32f0c7b6 100644 (file)
--- 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);
+       }
+}