eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

better error reporting in user authorization action

Browse Source 
darcs-hash:20080822212111-84dde-2770093fcfaa6fe03abb1143d3828f0622382b45.gz
This commit is contained in:
Evan Prodromou 2008-08-22 17:21:11 -04:00
parent 97341a4c94
commit ea40dabb39
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
actions/userauthorization.php
View File

@ -33,30 +33,30 @@ class UserauthorizationAction extends Action {
} else { } else {
if (!common_logged_in()) { if (!common_logged_in()) {
# Go log in, and then come back # Go log in, and then come back
common_debug('userauthorization.php - saving URL for returnto'); common_debug('saving URL for returnto', __FILE__);
$argsclone = $_GET; $argsclone = $_GET;
unset($argsclone['action']); unset($argsclone['action']);
common_set_returnto(common_local_url('userauthorization', $argsclone)); common_set_returnto(common_local_url('userauthorization', $argsclone));
common_debug('userauthorization.php - redirecting to login'); common_debug('redirecting to login', __FILE__);
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'));
return; return;
} }
try { try {
# this must be a new request # this must be a new request
common_debug('userauthorization.php - getting new request'); common_debug('getting new request', __FILE__);
$req = $this->get_new_request(); $req = $this->get_new_request();
if (!$req) { if (!$req) {
common_server_error(_('No request found!')); $this->client_error(_('No request found!'));
} }
common_debug('userauthorization.php - validating request'); common_debug('validating request', __FILE__);
# XXX: only validate new requests, since nonce is one-time use # XXX: only validate new requests, since nonce is one-time use
$this->validate_request($req); $this->validate_request($req);
common_debug('userauthorization.php - showing form'); common_debug('showing form', __FILE__);
$this->store_request($req); $this->store_request($req);
$this->show_form($req); $this->show_form($req);
} catch (OAuthException $e) { } catch (OAuthException $e) {
$this->clear_request(); $this->clear_request();
common_server_error($e->getMessage()); $this->client_error($e->getMessage());
return; return;
} }
@ -134,10 +134,10 @@ class UserauthorizationAction extends Action {
if ($this->arg('accept')) { if ($this->arg('accept')) {
if (!$this->authorize_token($req)) { if (!$this->authorize_token($req)) {
common_server_error(_('Error authorizing token')); $this->client_error(_('Error authorizing token'));
} }
if (!$this->save_remote_profile($req)) { if (!$this->save_remote_profile($req)) {
common_server_error(_('Error saving remote profile')); $this->client_error(_('Error saving remote profile'));
} }
if (!$callback) { if (!$callback) {
$this->show_accept_message($req->get_parameter('oauth_token')); $this->show_accept_message($req->get_parameter('oauth_token'));