Some more removed notices

[friendica.git] / src / Network / FKOAuthDataStore.php

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 7a3329776aed4d18b20ee11384f608ae92b31c36..8453ac829737cb25251c6e3abd6adb3b58a9767b 100644 (file)
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -10,8 +10,7 @@
 namespace Friendica\Network;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
 use OAuthConsumer;
 use OAuthDataStore;
 use OAuthToken;
@@ -42,10 +41,10 @@ class FKOAuthDataStore extends OAuthDataStore
        {
                logger(__function__ . ":" . $consumer_key);
 
-               $s = dba::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
-               $r = dba::inArray($s);
+               $s = DBA::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
+               $r = DBA::toArray($s);
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
                }
 
@@ -62,10 +61,10 @@ class FKOAuthDataStore extends OAuthDataStore
        {
                logger(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
 
-               $s = dba::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]);
-               $r = dba::inArray($s);
+               $s = DBA::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]);
+               $r = DBA::toArray($s);
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $ot = new OAuthToken($r[0]['id'], $r[0]['secret']);
                        $ot->scope = $r[0]['scope'];
                        $ot->expires = $r[0]['expires'];
@@ -85,8 +84,8 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function lookup_nonce($consumer, $token, $nonce, $timestamp)
        {
-               $token = dba::selectFirst('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp]);
-               if (DBM::is_result($token)) {
+               $token = DBA::selectFirst('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp]);
+               if (DBA::isResult($token)) {
                        return new OAuthToken($token['id'], $token['secret']);
                }
 
@@ -110,7 +109,7 @@ class FKOAuthDataStore extends OAuthDataStore
                        $k = $consumer;
                }
 
-               $r = dba::insert(
+               $r = DBA::insert(
                        'tokens',
                        [
                                'id' => $key,
@@ -151,7 +150,7 @@ class FKOAuthDataStore extends OAuthDataStore
                if (is_null($verifier) || ($uverifier !== false)) {
                        $key = self::genToken();
                        $sec = self::genToken();
-                       $r = dba::insert(
+                       $r = DBA::insert(
                                'tokens',
                                [
                                        'id' => $key,
@@ -167,7 +166,7 @@ class FKOAuthDataStore extends OAuthDataStore
                        }
                }
 
-               dba::delete('tokens', ['id' => $token->key]);
+               DBA::delete('tokens', ['id' => $token->key]);
 
                if (!is_null($ret) && !is_null($uverifier)) {
                        Config::delete("oauth", $verifier);