Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
index 55ba68adc5c49a4c0f6af76036e63d70f41f9735..d80dd609e3aba1dfcff24f222d3127f7d8e9d01a 100644 (file)
--- a/actions/atompubshowsubscription.php
+++ b/actions/atompubshowsubscription.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Single subscription
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -28,13 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    // This check helps protect against security problems;
-    // your code file can't be executed directly from the web.
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apiauth.php';
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
 
 /**
  * Show a single subscription
@@ -46,48 +40,42 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
-class AtompubshowsubscriptionAction extends ApiAuthAction
+class AtompubshowsubscriptionAction extends AtompubAction
 {
     private $_subscriber   = null;
     private $_subscribed   = null;
     private $_subscription = null;
 
-    /** 
-     * For initializing members of the class.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-
-    function prepare($argarray)
+    protected function atompubPrepare()
     {
-        parent::prepare($argarray);
         $subscriberId = $this->trimmed('subscriber');
 
-        $this->_subscriber = Profile::staticGet('id', $subscriberId);
+        $this->_subscriber = Profile::getKV('id', $subscriberId);
 
-        if (empty($this->_subscriber)) {
-            throw new ClientException(sprintf(_('No such profile id: %d'),
+        if (!$this->_subscriber instanceof Profile) {
+            // TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
+            // TRANS: %d is the non-existing profile ID number.
+            throw new ClientException(sprintf(_('No such profile id: %d.'),
                                               $subscriberId), 404);
         }
 
         $subscribedId = $this->trimmed('subscribed');
 
-        $this->_subscribed = Profile::staticGet('id', $subscribedId);
+        $this->_subscribed = Profile::getKV('id', $subscribedId);
 
-        if (empty($this->_subscribed)) {
-            throw new ClientException(sprintf(_('No such profile id: %d'),
+        if (!$this->_subscribed instanceof Profile) {
+            // TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
+            // TRANS: %d is the non-existing profile ID number.
+            throw new ClientException(sprintf(_('No such profile id: %d.'),
                                               $subscribedId), 404);
         }
 
-        $this->_subscription = 
-            Subscription::pkeyGet(array('subscriber' => $subscriberId,
-                                        'subscribed' => $subscribedId));
-
-        if (empty($this->_subscription)) {
-            $msg = sprintf(_('Profile %d not subscribed to profile %d'),
+        $this->_subscription = Subscription::pkeyGet(array('subscriber' => $subscriberId,
+                                                           'subscribed' => $subscribedId));
+        if (!$this->_subscription instanceof Subscription) {
+            // TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
+            // TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
+            $msg = sprintf(_('Profile %1$d not subscribed to profile %2$d.'),
                            $subscriberId, $subscribedId);
             throw new ClientException($msg, 404);
         }
@@ -95,31 +83,14 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         return true;
     }
 
-    /**
-     * Handler method
-     *
-     * @param array $argarray is ignored since it's now passed in in prepare()
-     *
-     * @return void
-     */
-
-    function handle($argarray=null)
+    protected function handleGet()
     {
-        parent::handle($argarray);
-        switch ($_SERVER['REQUEST_METHOD']) {
-        case 'HEAD':
-        case 'GET':
-            $this->showSubscription();
-            break;
-        case 'DELETE':
-            $this->deleteSubscription();
-            break;
-        default:
-            $this->clientError(_('HTTP method not supported.'), 405);
-            return;
-        }
+        $this->showSubscription();
+    }
 
-        return;
+    protected function handleDelete()
+    {
+        $this->deleteSubscription();
     }
 
     /**
@@ -127,7 +98,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showSubscription()
     {
         $activity = $this->_subscription->asActivity();
@@ -137,8 +107,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         $this->startXML();
         $this->raw($activity->asString(true, true, true));
         $this->endXML();
-
-        return;
     }
 
     /**
@@ -146,19 +114,15 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return void
      */
-
     function deleteSubscription()
     {
-        if (empty($this->auth_user) ||
-            $this->auth_user->id != $this->_subscriber->id) {
-            throw new ClientException(_("Can't delete someone else's".
-                                        " subscription"), 403);
+        if (!$this->scoped instanceof Profile ||
+                $this->scoped->id != $this->_subscriber->id) {
+            // TRANS: Client exception thrown when trying to delete a subscription of another user.
+            throw new ClientException(_("Cannot delete someone else's subscription."), 403);
         }
 
-        Subscription::cancel($this->_subscriber,
-                             $this->_subscribed);
-
-        return;
+        Subscription::cancel($this->_subscriber, $this->_subscribed);
     }
 
     /**
@@ -168,14 +132,13 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return boolean true
      */
-    
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
             return false;
-        } else {
-            return true;
         }
+
+        return true;
     }
 
     /**
@@ -183,7 +146,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return string last modified http header
      */
-
     function lastModified()
     {
         return max(strtotime($this->_subscriber->modified),
@@ -196,7 +158,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return string etag http header
      */
-
     function etag()
     {
         $mtime = strtotime($this->_subscription->modified);
@@ -212,7 +173,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return boolean true if delete, else false
      */
-
     function requiresAuth()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {