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

mixed up OAuthConsumer and Consumer classes

Browse Source 
darcs-hash:20080606054549-84dde-9d90611b14fa441873fc4504548d46848dbdf5b4.gz
This commit is contained in:
Evan Prodromou 2008-06-06 01:45:49 -04:00
parent e25d249a10
commit c22fb6e569
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/oauthstore.php
View File

@ -41,7 +41,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
function lookup_token($consumer, $token_type, $token) { function lookup_token($consumer, $token_type, $token) {
$t = new Token(); $t = new Token();
$t->consumer_key = $consumer->consumer_key; $t->consumer_key = $consumer->key;
$t->tok = $token; $t->tok = $token;
$t->type = ($token_type == 'access') ? 1 : 0; $t->type = ($token_type == 'access') ? 1 : 0;
if ($t->find(true)) { if ($t->find(true)) {
@ -53,7 +53,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
function lookup_nonce($consumer, $token, $nonce, $timestamp) { function lookup_nonce($consumer, $token, $nonce, $timestamp) {
$n = new Nonce(); $n = new Nonce();
$n->consumer_key = $consumer->consumer_key; $n->consumer_key = $consumer->key;
$n->tok = $token; $n->tok = $token;
$n->nonce = $nonce; $n->nonce = $nonce;
if ($n->find(TRUE)) { if ($n->find(TRUE)) {
@ -67,9 +67,9 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
} }
function new_request_token($consumer) { function new_request_token($consumer) {
common_debug('new_request_token("'.$consumer->consumer_key.'")', __FILE__); common_debug('new_request_token("'.$consumer->key.'")', __FILE__);
$t = new Token(); $t = new Token();
$t->consumer_key = $consumer->consumer_key; $t->consumer_key = $consumer->key;
$t->tok = common_good_rand(16); $t->tok = common_good_rand(16);
$t->secret = common_good_rand(16); $t->secret = common_good_rand(16);
$t->type = 0; # request $t->type = 0; # request
@ -90,11 +90,11 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
function new_access_token($token, $consumer) { function new_access_token($token, $consumer) {
$rt = new Token(); $rt = new Token();
$rt->consumer_key = $consumer->consumer_key; $rt->consumer_key = $consumer->key;
$rt->tok = $token; $rt->tok = $token;
if ($rt->find(TRUE) && $rt->state == 1) { if ($rt->find(TRUE) && $rt->state == 1) {
$at = new Token(); $at = new Token();
$at->consumer_key = $consumer->consumer_key; $at->consumer_key = $consumer->key;
$at->tok = common_good_rand(16); $at->tok = common_good_rand(16);
$at->secret = common_good_rand(16); $at->secret = common_good_rand(16);
$at->type = 1; # access $at->type = 1; # access