Fix for regression introduced with my last update to the

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 7ce50dac8cb0ecf944657ce9d0f71f8b5cda5539..a90d7facdfaca15e60c16d03c376833af228d448 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,70 +17,66 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-class SubscribeAction extends Action {
-       
-       function is_readonly() {
-               return false;
-       }
-       
-       function handle($args) {
-               parent::handle($args);
+class SubscribeAction extends Action
+{
 
-               if (!common_logged_in()) {
-                       common_user_error(_('Not logged in.'));
-                       return;
-               }
+    function handle($args)
+    {
+        parent::handle($args);
 
-               $user = common_current_user();
+        if (!common_logged_in()) {
+            $this->clientError(_('Not logged in.'));
+            return;
+        }
 
-               if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-                       common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
-                       return;
-               }
+        $user = common_current_user();
 
-               $other_nickname = $this->arg('subscribeto');
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+            return;
+        }
 
-               $other = User::staticGet('nickname', $other_nickname);
+        # CSRF protection
 
-               if (!$other) {
-                       common_user_error(_('No such user.'));
-                       return;
-               }
+        $token = $this->trimmed('token');
 
-               if ($user->isSubscribed($other)) {
-                       common_user_error(_('Already subscribed!.'));
-                       return;
-               }
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
 
-               if (!$user->subscribeTo($other)) {
-                       $this->server_error(_('Could not subscribe.'));
-                       return;
-               }
+        $other_id = $this->arg('subscribeto');
 
-               $this->notify($other, $user);
+        $other = User::staticGet('id', $other_id);
 
-               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)));
-       }
+        if (!$other) {
+            $this->clientError(_('Not a local user.'));
+            return;
+        }
 
-       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);
-       }
+        $result = subs_subscribe_to($user, $other);
 
-       function notify_email($listenee, $listener) {
-               mail_subscribe_notify($listenee, $listener);
-       }
-}
\ No newline at end of file
+        if (is_string($result)) {
+            $this->clientError($result);
+            return;
+        }
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $unsubscribe = new UnsubscribeForm($this, $other->getProfile());
+            $unsubscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                $user->nickname)),
+                            303);
+        }
+    }
+}