X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapistatusesshow.php;h=80b0374a63a8a51f203e62af06113bb7260bac41;hb=fb65d5901d586a13886b81d84de8959b67b6aa9e;hp=86ffd6862eb13b9bcc448c658e3f0fb1865bf1f9;hpb=75fcf1e081f1a8022094410a9f379a55753a139c;p=quix0rs-gnu-social.git diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php index 86ffd6862e..80b0374a63 100644 --- a/actions/apistatusesshow.php +++ b/actions/apistatusesshow.php @@ -55,10 +55,8 @@ require_once INSTALLDIR . '/lib/apiprivateauth.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 ApiStatusesShowAction extends ApiPrivateAuthAction { - var $notice_id = null; var $notice = null; @@ -68,9 +66,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -100,12 +96,12 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) { parent::handle($args); if (!in_array($this->format, array('xml', 'json', 'atom'))) { + // TRANS: Client error displayed when trying to handle an unknown API method. $this->clientError(_('API method not found.'), 404); return; } @@ -128,7 +124,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction * * @return void */ - function showNotice() { if (!empty($this->notice)) { @@ -146,7 +141,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction throw new Exception(sprintf(_("Unsupported format: %s"), $this->format)); } } else { - // XXX: Twitter just sets a 404 header and doens't bother // to return an err msg @@ -154,12 +148,14 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction if (!empty($deleted)) { $this->clientError( + // TRANS: Client error displayed requesting a deleted status. _('Status deleted.'), 410, $this->format ); } else { $this->clientError( + // TRANS: Client error displayed requesting a status with an invalid ID. _('No status with that ID found.'), 404, $this->format @@ -169,16 +165,16 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction } /** - * Is this action read only? + * We expose AtomPub here, so non-GET/HEAD reqs must be read/write. * * @param array $args other arguments * * @return boolean true */ - + function isReadOnly($args) { - return true; + return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD'); } /** @@ -186,7 +182,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction * * @return string datestamp of the latest notice in the stream */ - function lastModified() { if (!empty($this->notice)) { @@ -204,7 +199,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction * * @return string etag */ - function etag() { if (!empty($this->notice)) {