X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fatompubsubscriptionfeed.php;h=26740da835c212b38b177cd61559ead97a279fd1;hb=382e4d2cdbd2dbfa211077fb9bce35441b8743cd;hp=b5577b71acb914b405a75b57a748fc751b94bc17;hpb=8dea5144a948a1c5dbf51ad8b3f39f4bd2e2fb30;p=quix0rs-gnu-social.git diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php index b5577b71ac..26740da835 100644 --- a/actions/atompubsubscriptionfeed.php +++ b/actions/atompubsubscriptionfeed.php @@ -4,7 +4,7 @@ * Copyright (C) 2010, StatusNet, Inc. * * AtomPub subscription feed - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -40,7 +40,7 @@ require_once INSTALLDIR . '/lib/apiauth.php'; * Subscription feed class for AtomPub * * Generates a list of the user's subscriptions - * + * * @category AtomPub * @package StatusNet * @author Evan Prodromou @@ -48,11 +48,10 @@ 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 AtompubsubscriptionfeedAction extends ApiAuthAction { - private $_profile = null; - private $_subscribed = null; + private $_profile = null; + private $_subscriptions = null; /** * For initializing members of the class. @@ -61,26 +60,28 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return boolean true */ - function prepare($argarray) { parent::prepare($argarray); - + $subscriber = $this->trimmed('subscriber'); $this->_profile = Profile::staticGet('id', $subscriber); if (empty($this->_profile)) { - throw new ClientException(sprintf(_('No such profile id: %d'), + // 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.'), $subscriber), 404); } // page and count from ApiAction - // Note: this is a list of profiles, not subscriptions - $this->_subscribed = - $this->_profile->getSubscriptions(($this->page-1) * $this->count, - $this->count + 1); + $offset = ($this->page-1) * $this->count; + + $this->_subscriptions = Subscription::bySubscriber($subscriber, + $offset, + $this->count + 1); return true; } @@ -92,7 +93,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return void */ - function handle($argarray=null) { parent::handle($argarray); @@ -105,6 +105,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction $this->addSubscription(); break; default: + // TRANS: Client exception thrown when using an unsupported HTTP method. $this->clientError(_('HTTP method not supported.'), 405); return; } @@ -117,7 +118,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return void */ - function showFeed() { header('Content-Type: application/atom+xml; charset=utf-8'); @@ -143,21 +143,25 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction $feed->addAuthor($this->_profile->getBestName(), $this->_profile->getURI()); + // TRANS: Title for Atom subscription feed. + // TRANS: %s is a user nickname. $feed->setTitle(sprintf(_("%s subscriptions"), $this->_profile->getBestName())); - $feed->setSubtitle(sprintf(_("People %s has subscribed to on %s"), - $this->_profile->getBestName()), - common_config('site', 'name')); + // TRANS: Subtitle for Atom subscription feed. + // TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename. + $feed->setSubtitle(sprintf(_("People %1\$s has subscribed to on %2\$s"), + $this->_profile->getBestName(), + common_config('site', 'name'))); $feed->addLink(common_local_url('subscriptions', - array('nickname' => + array('nickname' => $this->_profile->nickname))); $feed->addLink($url, array('rel' => 'self', 'type' => 'application/atom+xml')); - + // If there's more... if ($this->page > 1) { @@ -166,20 +170,20 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction 'type' => 'application/atom+xml')); $feed->addLink(common_local_url('AtomPubSubscriptionFeed', - array('subscriber' => - $this->_profile->id, - 'page' => + array('subscriber' => + $this->_profile->id), + array('page' => $this->page - 1)), array('rel' => 'prev', 'type' => 'application/atom+xml')); } - if ($this->_subscribed->N > $this->count) { + if ($this->_subscriptions->N > $this->count) { $feed->addLink(common_local_url('AtomPubSubscriptionFeed', array('subscriber' => - $this->_profile->id, - 'page' => + $this->_profile->id), + array('page' => $this->page + 1)), array('rel' => 'next', 'type' => 'application/atom+xml')); @@ -189,7 +193,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction // XXX: This is kind of inefficient - while ($this->_subscribed->fetch()) { + while ($this->_subscriptions->fetch()) { // We get one more than needed; skip that one @@ -199,25 +203,29 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction break; } - $sub = Subscription::pkeyGet(array('subscriber' => - $this->_profile->id, - 'subscribed' => - $this->_subscribed->id)); - $act = $sub->asActivity(); + $act = $this->_subscriptions->asActivity(); $feed->addEntryRaw($act->asString(false, false, false)); } $this->raw($feed->getString()); } + /** + * Add a new subscription + * + * Handling the POST method for AtomPub + * + * @return void + */ function addSubscription() { if (empty($this->auth_user) || $this->auth_user->id != $this->_profile->id) { - throw new ClientException(_("Can't add someone else's". - " subscription"), 403); + // TRANS: Client exception thrown when trying to subscribe another user. + throw new ClientException(_("Cannot add someone else's". + " subscription."), 403); } - + $xml = file_get_contents('php://input'); $dom = DOMDocument::loadXML($xml); @@ -236,8 +244,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction if (Event::handle('StartAtomPubNewActivity', array(&$activity))) { if ($activity->verb != ActivityVerb::FOLLOW) { - // TRANS: Client error displayed when not using the POST verb. - // TRANS: Do not translate POST. + // TRANS: Client error displayed when not using the follow verb. $this->clientError(_('Can only handle Follow activities.')); return; } @@ -245,6 +252,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction $person = $activity->objects[0]; if ($person->type != ActivityObject::PERSON) { + // TRANS: Client exception thrown when subscribing to an object that is not a person. $this->clientError(_('Can only follow people.')); return; } @@ -254,7 +262,19 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction $profile = Profile::fromURI($person->id); if (empty($profile)) { - $this->clientError(sprintf(_('Unknown profile %s'), $person->id)); + // TRANS: Client exception thrown when subscribing to a non-existing profile. + // TRANS: %s is the unknown profile ID. + $this->clientError(sprintf(_('Unknown profile %s.'), $person->id)); + return; + } + + if (Subscription::exists($this->_profile, $profile)) { + // 409 Conflict + // TRANS: Client error displayed trying to subscribe to an already subscribed profile. + // TRANS: %s is the profile the user already has a subscription on. + $this->clientError(sprintf(_('Already subscribed to %s.'), + $person->id), + 409); return; } @@ -285,7 +305,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return boolean is read only action? */ - function isReadOnly($args) { return $_SERVER['REQUEST_METHOD'] != 'POST'; @@ -296,7 +315,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return string last modified http header */ - function lastModified() { return null; @@ -307,7 +325,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return string etag http header */ - function etag() { return null; @@ -318,7 +335,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return boolean true if delete, else false */ - function requiresAuth() { if ($_SERVER['REQUEST_METHOD'] == 'POST') {