fix calls to show_rss_timeline

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 43506a593dd7d1eca17e65011a373aac27209fa9..20c258923bb0b2b33fed38d1d156e27e8cbe155a 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,6 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action {
+       
        function handle($args) {
                parent::handle($args);
 
@@ -35,62 +36,25 @@ class SubscribeAction extends Action {
                        return;
                }
 
-               $other_nickname = $this->arg('subscribeto');
-
-               $other = User::staticGet('nickname', $other_nickname);
+               # CSRF protection
 
-               if (!$other) {
-                       common_user_error(_('No such user.'));
+               $token = $this->trimmed('token');
+               
+               if (!$token || $token != common_session_token()) {
+                       $this->client_error(_('There was a problem with your session token. Try again, please.'));
                        return;
                }
 
-               if ($user->isSubscribed($other)) {
-                       common_user_error(_('Already subscribed!.'));
-                       return;
-               }
-
-               $sub = new Subscription();
-               $sub->subscriber = $user->id;
-               $sub->subscribed = $other->id;
-
-               $sub->created = DB_DataObject_Cast::dateTime(); # current time
+               $other_nickname = $this->arg('subscribeto');
 
-               if (!$sub->insert()) {
-                       common_server_error(_('Couldn\'t create subscription.'));
+               $result=subs_subscribe_user($user, $other_nickname);
+               
+               if($result != true) {
+                       common_user_error($result);
                        return;
                }
-
-               $this->notify($other, $user);
-
+               
                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 && $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);
-               }
-       }
 }
\ No newline at end of file