Some more removed notices

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

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index fa4de46e4fe1c76a7376480d1fd950e7a8b7a595..8453ac829737cb25251c6e3abd6adb3b58a9767b 100644 (file)
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @file src/Protocol/FKOAuthDataStore.php
+ * @file src/Network/FKOAuthDataStore.php
  * OAuth server
  * Based on oauth2-php <http://code.google.com/p/oauth2-php/>
  *
@@ -9,20 +9,17 @@
 
 namespace Friendica\Network;
 
-use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
+use OAuthConsumer;
 use OAuthDataStore;
+use OAuthToken;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
 
 require_once 'include/dba.php';
 
-require_once "library/OAuth1.php";
-
 /**
  * @brief OAuthDataStore class
  */
@@ -44,11 +41,11 @@ class FKOAuthDataStore extends OAuthDataStore
        {
                logger(__function__ . ":" . $consumer_key);
 
-               $s = dba::select('clients', array('client_id', 'pw', 'redirect_uri'), array('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)) {
-                       return new \OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
+               if (DBA::isResult($r)) {
+                       return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
                }
 
                return null;
@@ -64,11 +61,11 @@ class FKOAuthDataStore extends OAuthDataStore
        {
                logger(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
 
-               $s = dba::select('tokens', array('id', 'secret', 'scope', 'expires', 'uid'), array('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)) {
-                       $ot = new \OAuthToken($r[0]['id'], $r[0]['secret']);
+               if (DBA::isResult($r)) {
+                       $ot = new OAuthToken($r[0]['id'], $r[0]['secret']);
                        $ot->scope = $r[0]['scope'];
                        $ot->expires = $r[0]['expires'];
                        $ot->uid = $r[0]['uid'];
@@ -87,9 +84,9 @@ 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)) {
-                       return new \OAuthToken($token['id'], $token['secret']);
+               $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']);
                }
 
                return null;
@@ -112,21 +109,21 @@ class FKOAuthDataStore extends OAuthDataStore
                        $k = $consumer;
                }
 
-               $r = dba::insert(
+               $r = DBA::insert(
                        'tokens',
-                       array(
+                       [
                                'id' => $key,
                                'secret' => $sec,
                                'client_id' => $k,
                                'scope' => 'request',
-                               'expires' => time() + REQUEST_TOKEN_DURATION)
+                               'expires' => time() + REQUEST_TOKEN_DURATION]
                );
 
                if (!$r) {
                        return null;
                }
 
-               return new \OAuthToken($key, $sec);
+               return new OAuthToken($key, $sec);
        }
 
        /**
@@ -153,23 +150,23 @@ class FKOAuthDataStore extends OAuthDataStore
                if (is_null($verifier) || ($uverifier !== false)) {
                        $key = self::genToken();
                        $sec = self::genToken();
-                       $r = dba::insert(
+                       $r = DBA::insert(
                                'tokens',
-                               array(
+                               [
                                        'id' => $key,
                                        'secret' => $sec,
                                        'client_id' => $consumer->key,
                                        'scope' => 'access',
                                        'expires' => time() + ACCESS_TOKEN_DURATION,
-                                       'uid' => $uverifier)
+                                       'uid' => $uverifier]
                        );
 
                        if ($r) {
-                               $ret = new \OAuthToken($key, $sec);
+                               $ret = new OAuthToken($key, $sec);
                        }
                }
 
-               dba::delete('tokens', array('id' => $token->key));
+               DBA::delete('tokens', ['id' => $token->key]);
 
                if (!is_null($ret) && !is_null($uverifier)) {
                        Config::delete("oauth", $verifier);