X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapiaccountverifycredentials.php;h=dfa366cbb61f492f0eede95beb7411c9a5d28763;hb=627d84a1e2db2aca5d2ce1272f6e83fb7faa8ad2;hp=1095d5162634f312772ce78e4e533dc2a2eaf00a;hpb=9dc9c404cf5082ea769fb0c1d13c55742e046849;p=quix0rs-gnu-social.git diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php index 1095d51626..dfa366cbb6 100644 --- a/actions/apiaccountverifycredentials.php +++ b/actions/apiaccountverifycredentials.php @@ -33,8 +33,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apiauth.php'; - /** * Check a user's credentials. Returns an HTTP 200 OK response code and a * representation of the requesting user if authentication was successful; @@ -48,36 +46,35 @@ require_once INSTALLDIR . '/lib/apiauth.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 ApiAccountVerifyCredentialsAction extends ApiAuthAction { - /** * Handle the request * * Check whether the credentials are valid and output the result * * @param array $args $_REQUEST data (unused) - * * @return void */ - - function handle($args) + function handle(array $args=array()) { parent::handle($args); - switch ($this->format) { - case 'xml': - case 'json': - $args['id'] = $this->auth_user->id; - $action_obj = new ApiUserShowAction(); - if ($action_obj->prepare($args)) { - $action_obj->handle($args); - } - break; - default: - header('Content-Type: text/html; charset=utf-8'); - print 'Authorized'; + 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); + } + + $twitter_user = $this->twitterUserArray($this->auth_user->getProfile(), true); + + if ($this->format == 'xml') { + $this->initDocument('xml'); + $this->showTwitterXmlUser($twitter_user, 'user', true); + $this->endDocument('xml'); + } elseif ($this->format == 'json') { + $this->initDocument('json'); + $this->showJsonObjects($twitter_user); + $this->endDocument('json'); } } @@ -86,14 +83,11 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction * Is this action read only? * * @param array $args other arguments - * - * @return boolean true * - **/ - - function isReadOnly($args) + * @return boolean true + */ + function isReadOnly(array $args=array()) { return true; } - }