X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=actions%2Fsubscribe.php;h=4c46806e4047bcb211dcbffa71e2e2e8e376e076;hb=0587dcc0457e71cd15d6f2af38d181f522a73315;hp=10951dc3b4bfb7b0cbeaeb00442a0d379a0fc0f4;hpb=7c2c1855ba77f4f0d6a68fb57a020bdf7d1ae25b;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 10951dc3b4..4c46806e40 100644
--- 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,55 +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 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;
+        }
+
+        $user = common_current_user();
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+            return;
+        }
+
+        # CSRF protection
 
-		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
-			return;
-		}
+        $token = $this->trimmed('token');
 
-		# CSRF protection
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
+
+        $other_id = $this->arg('subscribeto');
 
-		$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 = User::staticGet('id', $other_id);
 
-		$other_nickname = $this->arg('subscribeto');
+        if (!$other) {
+            $this->clientError(_('Not a local user.'));
+            return;
+        }
 
-		$result=subs_subscribe_user($user, $other_nickname);
-		
-		if($result != true) {
-			common_user_error($result);
-			return;
-		}
+        $result = subs_subscribe_to($user, $other);
+
+        if($result != true) {
+            $this->clientError($result);
+            return;
+        }
 
-		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_subscribe_response();
-			common_element_end('body');
-			common_element_end('html');
-		} else {
-		    common_redirect(common_local_url('subscriptions', array('nickname' =>
-																$user->nickname)));
+        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);
         }
-	}
+    }
 }