fix calls to show_rss_timeline

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index f37095c1c649b98a9b587b4a88aaf6ef6a5214a2..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,47 +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;
-               }
+               $other_nickname = $this->arg('subscribeto');
 
-               if (!$user->subscribeTo($other)) {
-                       $this->server_error(_('Could not subscribe.'));
+               $result=subs_subscribe_user($user, $other_nickname);
+               
+               if($result != true) {
+                       common_user_error($result);
                        return;
                }
-
-               $this->notify($other, $user);
-
-               if ($other->autosubscribe && !$other->isSubscribed($user)) {
-                       if (!$other->subscribeTo($user)) {
-                               $this->server_error(_('Could not subscribe other to you.'));
-                               return;
-                       }
-                       $this->notify($user, $other);
-               }
                
                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
-               # XXX: Whatever happens, do it in Twitter-like API, too
-               $this->notify_email($listenee, $listener);
-       }
-
-       function notify_email($listenee, $listener) {
-               mail_subscribe_notify($listenee, $listener);
-       }
 }
\ No newline at end of file