trac750 Better workflow for inviting friends to use the Facebook app

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 8bb723799c3f37a311f84639c19ae5cf7b3910d7..f33d1d2077b6010fde138502709b30ae3ddf0a14 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -19,42 +19,62 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubscribeAction extends Action {
-       
-       function handle($args) {
-               parent::handle($args);
-
-               if (!common_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;
-               }
-
-               # CSRF protection
-
-               $token = $this->trimmed('token');
-               
-               if (!$token || $token != common_session_token()) {
-                       common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
-                       return;
-               }
-
-               $other_nickname = $this->arg('subscribeto');
-
-               $result=subs_subscribe_user($user, $other_nickname);
-               if($result != true) {
-                       common_user_error($result);
-                       return;
-               }
-               
-               common_redirect(common_local_url('subscriptions', array('nickname' =>
-                                                                                                                               $user->nickname)));
-       }
-
-}
\ No newline at end of file
+class SubscribeAction extends Action
+{
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!common_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;
+        }
+
+        # CSRF protection
+
+        $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;
+        }
+
+        $other_id = $this->arg('subscribeto');
+
+        $other = User::staticGet('id', $other_id);
+
+        if (!$other) {
+            $this->client_error(_('Not a local user.'));
+            return;
+        }
+
+        $result = subs_subscribe_to($user, $other);
+
+        if($result != true) {
+            common_user_error($result);
+            return;
+        }
+
+        if ($this->boolean('ajax')) {
+            common_start_html('text/xml;charset=utf-8', true);
+            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)));
+        }
+    }
+}