diff options
author | Evan Prodromou <evan@status.net> | 2010-02-06 11:24:12 +0100 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-02-06 11:24:12 +0100 |
commit | 823939ca84bd19ced394771d3f08b7c72a9dec84 (patch) | |
tree | a35918d128f8a70e5e5ab8a4de9c38aae0c4ce7a /actions/apiaccountverifycredentials.php | |
parent | 900cb8dd91b954d4e720b0c8afb2884419f43cd7 (diff) | |
parent | fc226a6ad5c4b120858b70d3af4d6f9c288d08d6 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/apiaccountverifycredentials.php')
-rw-r--r-- | actions/apiaccountverifycredentials.php | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php index 1095d5162..ea61a3205 100644 --- a/actions/apiaccountverifycredentials.php +++ b/actions/apiaccountverifycredentials.php @@ -66,18 +66,21 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction { 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'))) { + $this->clientError(_('API method not found.'), $code = 404); + return; + } + + $twitter_user = $this->twitterUserArray($this->auth_user->getProfile(), true); + + if ($this->format == 'xml') { + $this->initDocument('xml'); + $this->showTwitterXmlUser($twitter_user); + $this->endDocument('xml'); + } elseif ($this->format == 'json') { + $this->initDocument('json'); + $this->showJsonObjects($twitter_user); + $this->endDocument('json'); } } @@ -86,14 +89,14 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction * Is this action read only? * * @param array $args other arguments - * + * * @return boolean true * **/ - + function isReadOnly($args) { return true; } - + } |