lcase tname

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 9a1d43fa5df4786b5f97f61013575e5b51c481e2..43506a593dd7d1eca17e65011a373aac27209fa9 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -24,7 +24,14 @@ class SubscribeAction extends Action {
                parent::handle($args);
 
                if (!common_logged_in()) {
-                       common_user_error(_t('Not logged in.'));
+                       common_user_error(_('Not logged in.'));
+                       return;
+               }
+
+               $user = common_current_user();
+
+               if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+                       common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
                        return;
                }
 
@@ -33,14 +40,12 @@ class SubscribeAction extends Action {
                $other = User::staticGet('nickname', $other_nickname);
 
                if (!$other) {
-                       common_user_error(_t('No such user.'));
+                       common_user_error(_('No such user.'));
                        return;
                }
 
-               $user = common_current_user();
-
                if ($user->isSubscribed($other)) {
-                       common_user_error(_t('Already subscribed!.'));
+                       common_user_error(_('Already subscribed!.'));
                        return;
                }
 
@@ -51,7 +56,7 @@ class SubscribeAction extends Action {
                $sub->created = DB_DataObject_Cast::dateTime(); # current time
 
                if (!$sub->insert()) {
-                       common_server_error(_t('Couldn\'t create subscription.'));
+                       common_server_error(_('Couldn\'t create subscription.'));
                        return;
                }
 
@@ -60,38 +65,31 @@ class SubscribeAction extends Action {
                common_redirect(common_local_url('subscriptions', array('nickname' =>
                                                                                                                                $user->nickname)));
        }
-       
+
        function notify($listenee, $listener) {
                # XXX: add other notifications (Jabber, SMS) here
                # XXX: queue this and handle it offline
                $this->notify_email($listenee, $listener);
        }
-       
+
        function notify_email($listenee, $listener) {
-               if ($listenee->email) {
-                       global $config;
+               if ($listenee->email && $listenee->emailnotifysub) {
                        $profile = $listenee->getProfile();
                        $other = $listener->getProfile();
                        $name = $profile->getBestName();
-                       $other_name = $other->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'] = $other_name . _t(' is now listening to your notices on ') . $config['site']['name'];
-
-                       $body = 
-                         ($other->fullname) ? 
-                         ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
-
-                       $body .= _t(' is now listening to your notices on ') . $config['site']['name'] . '.';
-                       $body .= "\n\n";
-                       $body .= "\t".$other->profileurl;
-                       $body .= "\n\n";
-                       $body .= _t('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);
                }
        }