Split text to Item

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

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 6422afcf9cd22dd83f0ad020c0ed14b82f3413aa..44e14f2156b0cc6267ba5f307ffb094c3242260f 100644 (file)
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -10,8 +10,8 @@
 namespace Friendica\Network;
 
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use OAuthConsumer;
 use OAuthDataStore;
 use OAuthToken;
@@ -40,12 +40,12 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function lookup_consumer($consumer_key)
        {
-               logger(__function__ . ":" . $consumer_key);
+               Logger::log(__function__ . ":" . $consumer_key);
 
                $s = DBA::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
-               $r = DBA::inArray($s);
+               $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']);
                }
 
@@ -60,12 +60,12 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function lookup_token($consumer, $token_type, $token)
        {
-               logger(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
+               Logger::log(__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);
+               $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'];
@@ -86,7 +86,7 @@ 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)) {
+               if (DBA::isResult($token)) {
                        return new OAuthToken($token['id'], $token['secret']);
                }
 
@@ -100,7 +100,7 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function new_request_token($consumer, $callback = null)
        {
-               logger(__function__ . ":" . $consumer . ", " . $callback);
+               Logger::log(__function__ . ":" . $consumer . ", " . $callback);
                $key = self::genToken();
                $sec = self::genToken();
 
@@ -135,7 +135,7 @@ class FKOAuthDataStore extends OAuthDataStore
         */
        public function new_access_token($token, $consumer, $verifier = null)
        {
-               logger(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);
+               Logger::log(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);
 
                // return a new access token attached to this consumer
                // for the user associated with this token if the request token
@@ -146,7 +146,7 @@ class FKOAuthDataStore extends OAuthDataStore
 
                // get user for this verifier
                $uverifier = Config::get("oauth", $verifier);
-               logger(__function__ . ":" . $verifier . "," . $uverifier);
+               Logger::log(__function__ . ":" . $verifier . "," . $uverifier);
 
                if (is_null($verifier) || ($uverifier !== false)) {
                        $key = self::genToken();