GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

fix passing request around

Browse Source 
darcs-hash:20080604191206-84dde-24d6a80c9e3886352d451ca0993ed0bb6baafd7a.gz
This commit is contained in:
Evan Prodromou 2008-06-04 15:12:06 -04:00
parent d251e624a9
commit 9d670d25f8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/userauthorization.php
View File

@ -37,12 +37,12 @@ class UserauthorizationAction extends Action {
if (!$req) { if (!$req) {
# this must be a new request # this must be a new request
$req = $this->get_new_request(); $req = $this->get_new_request();
if (!$req) {
common_server_error(_t('No request found!'));
}
# 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);
} }
if (!$req) {
common_server_error(_t('No request found!'));
}
} catch (OAuthException $e) { } catch (OAuthException $e) {
$this->clear_request(); $this->clear_request();
common_server_error($e->getMessage()); common_server_error($e->getMessage());
@ -312,11 +312,12 @@ class UserauthorizationAction extends Action {
function get_new_request() { function get_new_request() {
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
return $req;
} }
# Throws an OAuthException if anything goes wrong # Throws an OAuthException if anything goes wrong
function validate_request($req) { function validate_request(&$req) {
# OAuth stuff -- have to copy from OAuth.php since they're # OAuth stuff -- have to copy from OAuth.php since they're
# all private methods, and there's no user-authentication method # all private methods, and there's no user-authentication method
$this->check_version($req); $this->check_version($req);
@ -397,7 +398,7 @@ class UserauthorizationAction extends Action {
# Snagged from OAuthServer # Snagged from OAuthServer
function check_version($req) { function check_version(&$req) {
$version = $req->get_parameter("oauth_version"); $version = $req->get_parameter("oauth_version");
if (!$version) { if (!$version) {
$version = 1.0; $version = 1.0;