lcase tname

[quix0rs-gnu-social.git] / actions / subscribe.php

diff --git a/actions/subscribe.php b/actions/subscribe.php
index bf97975768d53e59e9e07b343e3baf3f959edeb2..43506a593dd7d1eca17e65011a373aac27209fa9 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -73,8 +73,7 @@ class SubscribeAction extends Action {
        }
 
        function notify_email($listenee, $listener) {
-               if ($listenee->email) {
-                       global $config;
+               if ($listenee->email && $listenee->emailnotifysub) {
                        $profile = $listenee->getProfile();
                        $other = $listener->getProfile();
                        $name = $profile->getBestName();
@@ -82,17 +81,15 @@ class SubscribeAction extends Action {
                        $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.'), $name, $config['site']['name']);
-
-                       $body  = sprintf(_('%1$s is now listening to your notices on %2$s.'), $long_name, $config['site']['name']);
-                       $body .= "\n\n";
-                       $body .= "\t".$other->profileurl;
-                       $body .= "\n\n";
-                       $body .= _('Faithfully yours, ');
-                       $body .= "\n";
-                       $body .= $config['site']['name'];
-                       $body .= "\n";
-
+                       $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);
                }
        }