X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapisubscriptions.php;h=3f5d5f797b32d84f408ee4a922623b1115ff435d;hb=3326b7b850f538f0e3c2c7969c5e566e2a374ffb;hp=84731ac00fff4a46bf471cca286f756247bbdd6e;hpb=25198a8d4cee5b2182f1ecb99192a4108a01afa4;p=quix0rs-gnu-social.git

diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 84731ac00f..3f5d5f797b 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * This class outputs a list of profiles as Twitter-style user and status objects.
  * It is used by the API methods /api/statuses/(friends|followers). To support the
@@ -48,7 +46,7 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ApiSubscriptionsAction extends ApiBareAuthAction
+abstract class ApiSubscriptionsAction extends ApiBareAuthAction
 {
     var $profiles = null;
     var $tag      = null;
@@ -62,7 +60,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -78,12 +76,11 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
         $this->count    = isset($this->ids_only) ?
             5000 : (int)$this->arg('count', 100);
 
-        $this->user = $this->getTargetUser($this->arg('id'));
+        $this->target = $this->getTargetProfile($this->arg('id'));
 
-        if (empty($this->user)) {
+        if (!($this->target instanceof Profile)) {
             // TRANS: Client error displayed when requesting a list of followers for a non-existing user.
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return false;
+            $this->clientError(_('No such user.'), 404);
         }
 
         $this->profiles = $this->getProfiles();
@@ -96,18 +93,15 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
      *
      * Show the profiles
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
             // TRANS: Client error displayed when coming across a non-supported API method.
-            $this->clientError(_('API method not found.'), $code = 404);
-            return;
+            $this->clientError(_('API method not found.'), 404);
         }
 
         $this->initDocument($this->format);
@@ -122,13 +116,11 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
     }
 
     /**
-     * Get profiles - should get overrrided
+     * Get profiles related to the type of subscriber/subscription action
      *
      * @return array Profiles
      */
-    function getProfiles()
-    {
-    }
+    abstract protected function getProfiles();
 
     /**
      * Is this action read only?
@@ -137,7 +129,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -177,7 +169,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
                 array($this->arg('action'),
                       common_user_cache_hash($this->auth_user),
                       common_language(),
-                      $this->user->id,
+                      $this->target->id,
                       // Caching tags.
                       isset($this->ids_only) ? 'IDs' : 'Profiles',
                       strtotime($this->profiles[0]->created),