X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fatompubsubscriptionfeed.php;h=6a483b95c09f7c1cfea1d7ea0749add33a300758;hb=e868ac41cd8221c45dfed56a43d155fb2307a7e4;hp=15ae79f6a6c5782bd9ec9977d72d2994ddcd81ee;hpb=2503c33502607ad81da69dece32c6b981a4db335;p=quix0rs-gnu-social.git diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php index 15ae79f6a6..6a483b95c0 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 @@ -28,19 +28,13 @@ * @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); } /** * Subscription feed class for AtomPub * * Generates a list of the user's subscriptions - * + * * @category AtomPub * @package StatusNet * @author Evan Prodromou @@ -48,69 +42,39 @@ 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 +class AtompubsubscriptionfeedAction extends AtompubAction { private $_profile = null; private $_subscriptions = null; - /** - * For initializing members of the class. - * - * @param array $argarray misc. arguments - * - * @return boolean true - */ - - function prepare($argarray) + protected function atompubPrepare() { - parent::prepare($argarray); - $subscriber = $this->trimmed('subscriber'); - $this->_profile = Profile::staticGet('id', $subscriber); + $this->_profile = Profile::getKV('id', $subscriber); - if (empty($this->_profile)) { - throw new ClientException(sprintf(_('No such profile id: %d'), + if (!$this->_profile 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.'), $subscriber), 404); } - // page and count from ApiAction - - $offset = ($this->page-1) * $this->count; - - $this->_subscriptions = Subscription::bySubscriber($subscriber, - $offset, - $this->count + 1); + $this->_subscriptions = Subscription::bySubscriber($this->_profile->id, + $this->offset, + $this->limit); 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->showFeed(); - break; - case 'POST': - $this->addSubscription(); - break; - default: - $this->clientError(_('HTTP method not supported.'), 405); - return; - } + $this->showFeed(); + } - return; + protected function handlePost() + { + $this->addSubscription(); } /** @@ -118,7 +82,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @return void */ - function showFeed() { header('Content-Type: application/atom+xml; charset=utf-8'); @@ -137,6 +100,9 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction $feed->addNamespace('media', 'http://purl.org/syndication/atommedia'); + $feed->addNamespace('georss', + 'http://www.georss.org/georss'); + $feed->id = $url; $feed->setUpdated('now'); @@ -144,21 +110,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"), + // 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) { @@ -167,9 +137,9 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction 'type' => 'application/atom+xml')); $feed->addLink(common_local_url('AtomPubSubscriptionFeed', - array('subscriber' => + array('subscriber' => $this->_profile->id), - array('page' => + array('page' => $this->page - 1)), array('rel' => 'prev', 'type' => 'application/atom+xml')); @@ -214,15 +184,15 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction * * @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); @@ -231,7 +201,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction $dom->documentElement->localName != 'entry') { // TRANS: Client error displayed when not using an Atom entry. $this->clientError(_('Atom post must be an Atom entry.')); - return; } $activity = new Activity($dom->documentElement); @@ -241,31 +210,31 @@ 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; } $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; } // XXX: OStatus discovery (maybe) - - $profile = Profile::fromURI($person->id); - - if (empty($profile)) { - $this->clientError(sprintf(_('Unknown profile %s'), $person->id)); - return; + try { + $profile = Profile::fromUri($person->id); + } catch (UnknownUriException $e) { + // 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)); } - if (Subscription::start($this->_profile, $profile)) { - $sub = Subscription::pkeyGet(array('subscriber' => $this->_profile->id, - 'subscribed' => $profile->id)); + try { + $sub = Subscription::start($this->_profile, $profile); + } catch (AlreadyFulfilledException $e) { + // 409 Conflict + $this->clientError($e->getMessage(), 409); } Event::handle('EndAtomPubNewActivity', array($activity, $sub)); @@ -282,54 +251,4 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction $this->endXML(); } } - - /** - * Return true if read only. - * - * @param array $args other arguments - * - * @return boolean is read only action? - */ - - function isReadOnly($args) - { - return $_SERVER['REQUEST_METHOD'] != 'POST'; - } - - /** - * Return last modified, if applicable. - * - * @return string last modified http header - */ - - function lastModified() - { - return null; - } - - /** - * Return etag, if applicable. - * - * @return string etag http header - */ - - function etag() - { - return null; - } - - /** - * Does this require authentication? - * - * @return boolean true if delete, else false - */ - - function requiresAuth() - { - if ($_SERVER['REQUEST_METHOD'] == 'POST') { - return true; - } else { - return false; - } - } }