X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FFKOAuthDataStore.php;h=d1f43172b651f2d4f40503417718987198e7b6ec;hb=8eba329111e832d7efdacf4f6a6fa85b0f7abbf3;hp=154d63b72fbf1bc49324188b49eb8c76cb527dfd;hpb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;p=friendica.git

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 154d63b72f..d1f43172b6 100644
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -10,8 +10,8 @@
 namespace Friendica\Network;
 
 use Friendica\Core\Config;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Core\Logger;
+use Friendica\Database\DBA;
 use OAuthConsumer;
 use OAuthDataStore;
 use OAuthToken;
@@ -19,8 +19,6 @@ use OAuthToken;
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
 
-require_once 'include/dba.php';
-
 /**
  * @brief OAuthDataStore class
  */
@@ -37,15 +35,16 @@ class FKOAuthDataStore extends OAuthDataStore
 	/**
 	 * @param string $consumer_key key
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	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);
+		$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']);
 		}
 
@@ -57,15 +56,16 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $token_type type
 	 * @param string $token      token
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	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);
+		$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'];
@@ -82,11 +82,12 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $nonce     nonce
 	 * @param string $timestamp timestamp
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	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']);
 		}
 
@@ -97,10 +98,11 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $consumer consumer
 	 * @param string $callback optional, default null
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function new_request_token($consumer, $callback = null)
 	{
-		logger(__function__ . ":" . $consumer . ", " . $callback);
+		Logger::log(__function__ . ":" . $consumer . ", " . $callback);
 		$key = self::genToken();
 		$sec = self::genToken();
 
@@ -110,7 +112,7 @@ class FKOAuthDataStore extends OAuthDataStore
 			$k = $consumer;
 		}
 
-		$r = dba::insert(
+		$r = DBA::insert(
 			'tokens',
 			[
 				'id' => $key,
@@ -132,10 +134,11 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $consumer consumer
 	 * @param string $verifier optional, defult null
 	 * @return object
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	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,12 +149,12 @@ 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();
 			$sec = self::genToken();
-			$r = dba::insert(
+			$r = DBA::insert(
 				'tokens',
 				[
 					'id' => $key,
@@ -167,7 +170,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);