X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapigroupismember.php;h=c085f7b3c1fbefaa7e1ae36d66f741512da99a5e;hb=418b3c3c53194040022c4b56bd0c0b04fd6fd4d7;hp=eaa4769f3e1989db8db52dc687373125302d0447;hpb=12eee30586dbac883e39adf453586ffef9189214;p=quix0rs-gnu-social.git diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index eaa4769f3e..c085f7b3c1 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -35,8 +35,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apibareauth.php'; - /** * Returns whether a user is a member of a specified group. * @@ -49,7 +47,6 @@ 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 ApiGroupIsMemberAction extends ApiBareAuthAction { var $group = null; @@ -60,14 +57,13 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); - $this->user = $this->getTargetUser(null); + $this->target = $this->getTargetProfile(null); $this->group = $this->getTargetGroup(null); return true; @@ -78,26 +74,23 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction * * Save the new message * - * @param array $args $_REQUEST data (unused) - * * @return void */ - - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); - if (empty($this->user)) { - $this->clientError(_('No such user.'), 404, $this->format); - return; + if (empty($this->target)) { + // TRANS: Client error displayed when checking group membership for a non-existing user. + $this->clientError(_('No such user.'), 404); } if (empty($this->group)) { - $this->clientError(_('Group not found.'), 404, $this->format); - return false; + // TRANS: Client error displayed when checking group membership for a non-existing group. + $this->clientError(_('Group not found.'), 404); } - $is_member = $this->user->isMember($this->group); + $is_member = $this->target->isMember($this->group); switch($this->format) { case 'xml': @@ -111,12 +104,8 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction $this->endDocument('json'); break; default: - $this->clientError( - _('API method not found.'), - 400, - $this->format - ); - break; + // TRANS: Client error displayed when coming across a non-supported API method. + $this->clientError(_('API method not found.')); } } @@ -129,10 +118,8 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction * * @return boolean is read only action? */ - function isReadOnly($args) { return true; } - }