fix calls to show_rss_timeline

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 68fdd24e98d5bca9679b7b1d9cfc81570d054d69..20c258923bb0b2b33fed38d1d156e27e8cbe155a 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, 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
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -20,42 +20,41 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action {
+       
        function handle($args) {
                parent::handle($args);
-               
+
                if (!common_logged_in()) {
-                       common_user_error(_t('Not logged in.'));
+                       common_user_error(_('Not logged in.'));
                        return;
                }
-               
-               $other_nickname = $this->arg('subscribeto');
 
-               $other = User::staticGet('nickname', $other_nickname);
-               
-               if (!$other) {
-                       common_user_error(_t('No such user.'));
-                       return;
-               }
-               
                $user = common_current_user();
 
-               if ($user->isSubscribed($other)) {
-                       common_user_error(_t('Already subscribed!.'));
+               if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+                       common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
                        return;
                }
+
+               # CSRF protection
+
+               $token = $this->trimmed('token');
                
-               $sub = new Subscription();
-               $sub->subscriber = $user->id;
-               $sub->subscribed = $other->id;
-               
-               $sub->created = time();
+               if (!$token || $token != common_session_token()) {
+                       $this->client_error(_('There was a problem with your session token. Try again, please.'));
+                       return;
+               }
+
+               $other_nickname = $this->arg('subscribeto');
+
+               $result=subs_subscribe_user($user, $other_nickname);
                
-               if (!$sub->insert()) {
-                       common_server_error(_t('Couldn\'t create subscription.'));
+               if($result != true) {
+                       common_user_error($result);
                        return;
                }
                
-               common_redirect(common_local_url('all', array('nickname' =>
-                                                                                                         $user->nickname)));
+               common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                                                                               $user->nickname)));
        }
 }
\ No newline at end of file