clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename DBM method calls to DBA method calls

Browse Source
This commit is contained in:
Hypolite Petovan
2018-07-21 08:40:21 -04:00
committed by Hypolite Petovan
parent 8ddb94ef06
commit 0ec44f3e8a
153 changed files with 813 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Network/FKOAuthDataStore.php
View File

@@ -11,7 +11,6 @@ namespace Friendica\Network;
use Friendica\Core\Config;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use OAuthConsumer;
use OAuthDataStore;
use OAuthToken;
@@ -45,7 +44,7 @@ class FKOAuthDataStore extends OAuthDataStore
$s = DBA::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
$r = DBA::toArray($s);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
}
@@ -65,7 +64,7 @@ class FKOAuthDataStore extends OAuthDataStore
$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::is_result($r)) {
$ot = new OAuthToken($r[0]['id'], $r[0]['secret']);
$ot->scope = $r[0]['scope'];
$ot->expires = $r[0]['expires'];
@@ -86,7 +85,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::is_result($token)) {
return new OAuthToken($token['id'], $token['secret']);
}