diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-05-30 10:23:24 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-05-30 10:23:24 -0400 |
| commit | c501b7b9259b6fc8c34655b870ce79f102ada137 (patch) | |
| tree | 00eaba024ac6c4021262d8f6628977a560df0159 /actions/userauthorization.php | |
| parent | 9210f956332d5fcd786dd3ec757e6fd789f9a1ad (diff) | |
interim commit after pull from server
darcs-hash:20080530142324-84dde-782c9f04f551447514f1557b9e80f8461a17771f.gz
Diffstat (limited to 'actions/userauthorization.php')
| -rw-r--r-- | actions/userauthorization.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/actions/userauthorization.php b/actions/userauthorization.php index cc7ec85a5..ee156bd79 100644 --- a/actions/userauthorization.php +++ b/actions/userauthorization.php @@ -29,7 +29,10 @@ class UserauthorizationAction extends Action { try { $req = $this->get_request(); $server = common_oauth_server(); - list($consumer, $token) = $server->verify_request($req); + $server->get_version($req); + $consumer = $server->get_consumer($req); + $token = $server->get_token($req, $consumer, "request"); + $server->check_signature($req, $consumer, $token); } catch (OAuthException $e) { $this->clear_request(); common_server_error($e->getMessage()); @@ -39,7 +42,8 @@ class UserauthorizationAction extends Action { if (common_logged_in()) { $this->show_form($req); } else { - common_return_to(common_local_url('userauthorization')); + # Go log in, and then come back + common_set_returnto(common_local_url('userauthorization')); common_redirect(common_local_url('login')); } } @@ -56,7 +60,9 @@ class UserauthorizationAction extends Action { if (!$req) { # XXX: may have an uncaught exception $req = OAuthRequest::from_request(); - $this->store_request($req); + if ($req) { + $this->store_request($req); + } } return $req; } @@ -69,6 +75,7 @@ class UserauthorizationAction extends Action { function send_authorization() { $req = $this->get_request(); + if (!$req) { common_user_error(_t('No authorization request!')); return; |