Review

updates based on review.

diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php
index a323f5cd568080cdd9a3a5c17b85fbab2a6a749c..768cae7d1b23b458e95d92f891db9ec3599b3fc0 100644 (file)
--- a/src/Network/FKOAuth1.php
+++ b/src/Network/FKOAuth1.php
@@ -37,11 +37,9 @@ class FKOAuth1 extends OAuthServer
        {
                logger("FKOAuth1::loginUser $uid");
                $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)) {
-                       $record = $r;
-               } else {
+               if (!DBM::is_result($record)) {
                        logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
                        header('HTTP/1.0 401 Unauthorized');
                        die('This api requires login');

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 007908b99bc5b33c9cd135dcab11ac1a2418e876..0fcd01fc5c85005daf826b25dd777a4055f67c52 100644 (file)
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -83,9 +83,8 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        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::inArray($s);
-               
+               $r = dba::select('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp], ['limit' => 1]);
+                               
                if (DBM::is_result($r)) {
                        return new OAuthToken($r[0]['id'], $r[0]['secret']);
                }