keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Review

Browse source 
updates based on review.
This commit is contained in:
Adam Magness 2017-12-04 16:33:10 -05:00
parent 2bbfc0640f
commit 547e24b443
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Network/FKOAuth1.php
View file

@ -37,11 +37,9 @@ class FKOAuth1 extends OAuthServer
{ {
logger("FKOAuth1::loginUser $uid"); logger("FKOAuth1::loginUser $uid");
$a = get_app(); $a = get_app();
$r = dba::select('user', array(), array('uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1), array('limit' => 1)); $record = dba::select('user', array(), array('uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1), array('limit' => 1));
if (DBM::is_result($r)) { if (!DBM::is_result($record)) {
$record = $r;
} else {
logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG); logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
die('This api requires login'); die('This api requires login');

5
src/Network/FKOAuthDataStore.php
View file

@ -83,9 +83,8 @@ class FKOAuthDataStore extends OAuthDataStore
*/ */
public static function lookup_nonce($consumer, $token, $nonce, $timestamp) public static function lookup_nonce($consumer, $token, $nonce, $timestamp)
{ {
$s = dba::select('tokens', array('id', 'secret'), array('client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp)); $r = dba::select('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp], ['limit' => 1]);
$r = dba::inArray($s);
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
return new OAuthToken($r[0]['id'], $r[0]['secret']); return new OAuthToken($r[0]['id'], $r[0]['secret']);
} }