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

Function declarations to match parent class

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-07-16 18:45:59 +02:00
parent 44dc00a58c
commit 94d54ebc29
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/apignusocialoauthdatastore.php
View File

@ -26,20 +26,20 @@ require_once 'OAuth.php';
*/ */
class ApiGNUsocialOAuthDataStore extends OAuthDataStore class ApiGNUsocialOAuthDataStore extends OAuthDataStore
{ {
function lookup_consumer($consumerKey) function lookup_consumer($consumer_key)
{ {
$con = Consumer::getKV('consumer_key', $consumerKey); $con = Consumer::getKV('consumer_key', $consumer_key);
if (!$con instanceof Consumer) { if (!$con instanceof Consumer) {
// Create an anon consumer and anon application if one // Create an anon consumer and anon application if one
// doesn't exist already // doesn't exist already
if ($consumerKey == 'anonymous') { if ($consumer_key == 'anonymous') {
common_debug("API OAuth - creating anonymous consumer"); common_debug("API OAuth - creating anonymous consumer");
$con = new Consumer(); $con = new Consumer();
$con->consumer_key = $consumerKey; $con->consumer_key = $consumer_key;
$con->consumer_secret = $consumerKey; $con->consumer_secret = $consumer_key;
$con->created = common_sql_now(); $con->created = common_sql_now();
$result = $con->insert(); $result = $con->insert();
@ -388,7 +388,7 @@ class ApiGNUsocialOAuthDataStore extends OAuthDataStore
* *
* @return OAuthToken $token a new unauthorized OAuth request token * @return OAuthToken $token a new unauthorized OAuth request token
*/ */
function new_request_token($consumer, $callback) function new_request_token($consumer, $callback = null)
{ {
$t = new Token(); $t = new Token();
$t->consumer_key = $consumer->key; $t->consumer_key = $consumer->key;
@ -473,13 +473,13 @@ class ApiGNUsocialOAuthDataStore extends OAuthDataStore
* @param type $token_key * @param type $token_key
* @return OAuthToken * @return OAuthToken
*/ */
function lookup_token($consumer, $token_type, $token_key) function lookup_token($consumer, $token_type, $token)
{ {
$t = new Token(); $t = new Token();
if (!is_null($consumer)) { if (!is_null($consumer)) {
$t->consumer_key = $consumer->key; $t->consumer_key = $consumer->key;
} }
$t->tok = $token_key; $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)) {
return new OAuthToken($t->tok, $t->secret); return new OAuthToken($t->tok, $t->secret);