Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 00:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename Friendica\Database\dba to Friendica\Database\DBA

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-20 08:19:26 -04:00
parent b6a1df0598
commit af6dbc654f
127 changed files with 1169 additions and 1169 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Util/ExAuth.php
View file

@ -36,7 +36,7 @@ namespace Friendica\Util;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\User;
@ -71,7 +71,7 @@ class ExAuth
{
while (!feof(STDIN)) {
// Quit if the database connection went down
if (!dba::connected()) {
if (!DBA::connected()) {
$this->writeLog(LOG_ERR, 'the database connection went down');
return;
}
@ -144,7 +144,7 @@ class ExAuth
// Does the hostname match? So we try directly
if ($a->get_hostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, 'internal user check for ' . $sUser . '@' . $aCommand[2]);
$found = dba::exists('user', ['nickname' => $sUser]);
$found = DBA::exists('user', ['nickname' => $sUser]);
} else {
$found = false;
}
@ -225,7 +225,7 @@ class ExAuth
if ($a->get_hostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
$aUser = dba::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
$aUser = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
if (DBM::is_result($aUser)) {
$uid = $aUser['uid'];
$success = User::authenticate($aUser, $aCommand[3]);

6
src/Util/HTTPSignature.php
View file

@ -6,7 +6,7 @@
namespace Friendica\Util;
use Friendica\Core\Config;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
/**
@ -179,9 +179,9 @@ class HTTPSignature
private static function getActivitypubKey($id)
{
if (strpos($id, 'acct:') === 0) {
$contact = dba::selectFirst('contact', ['pubkey'], ['uid' => 0, 'addr' => str_replace('acct:', '', $id)]);
$contact = DBA::selectFirst('contact', ['pubkey'], ['uid' => 0, 'addr' => str_replace('acct:', '', $id)]);
} else {
$contact = dba::selectFirst('contact', ['pubkey'], ['id' => $id, 'network' => 'activitypub']);
$contact = DBA::selectFirst('contact', ['pubkey'], ['id' => $id, 'network' => 'activitypub']);
}
if (DBM::is_result($contact)) {

6
src/Util/ParseUrl.php
View file

@ -9,7 +9,7 @@ use DOMDocument;
use DOMXPath;
use Friendica\Content\OEmbed;
use Friendica\Core\Addon;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Object\Image;
require_once 'include/dba.php';
@ -47,7 +47,7 @@ class ParseUrl
return false;
}
$parsed_url = dba::selectFirst('parsed_url', ['content'],
$parsed_url = DBA::selectFirst('parsed_url', ['content'],
['url' => normalise_link($url), 'guessing' => !$no_guessing, 'oembed' => $do_oembed]
);
if (!empty($parsed_url['content'])) {
@ -57,7 +57,7 @@ class ParseUrl
$data = self::getSiteinfo($url, $no_guessing, $do_oembed);
dba::insert(
DBA::insert(
'parsed_url',
[
'url' => normalise_link($url), 'guessing' => !$no_guessing,