Profile block base style

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index f37095c1c649b98a9b587b4a88aaf6ef6a5214a2..a032cf71769278b83da547d6766531306bc3ac33 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,43 @@ class SubscribeAction extends Action {
                        return;
                }
 
-               $other_nickname = $this->arg('subscribeto');
+               # CSRF protection
 
-               $other = User::staticGet('nickname', $other_nickname);
+               $token = $this->trimmed('token');
 
-               if (!$other) {
-                       common_user_error(_('No such user.'));
+               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_id = $this->arg('subscribeto');
 
-               if (!$user->subscribeTo($other)) {
-                       $this->server_error(_('Could not subscribe.'));
+        $other = User::staticGet('id', $other_id);
+
+        if (!$other) {
+                       $this->client_error(_('Not a local user.'));
                        return;
-               }
+        }
 
-               $this->notify($other, $user);
+               $result = subs_subscribe_to($user, $other);
 
-               if ($other->autosubscribe && !$other->isSubscribed($user)) {
-                       if (!$other->subscribeTo($user)) {
-                               $this->server_error(_('Could not subscribe other to you.'));
-                               return;
-                       }
-                       $this->notify($user, $other);
+               if($result != true) {
+                       common_user_error($result);
+                       return;
                }
-               
-               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);
+               if ($this->boolean('ajax')) {
+                       common_start_html('text/xml');
+                       common_element_start('head');
+                       common_element('title', null, _('Subscribed'));
+                       common_element_end('head');
+                       common_element_start('body');
+                       common_unsubscribe_form($other->getProfile());
+                       common_element_end('body');
+                       common_element_end('html');
+               } else {
+                   common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                                                                               $user->nickname)));
+        }
        }
-}
\ No newline at end of file
+}