Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-13 19:44:10 +02:00
Code Issues Projects Releases Packages 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

21
src/Protocol/PortableContact.php
View file

@ -16,7 +16,6 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Network\Probe;
@ -68,7 +67,7 @@ class PortableContact
if ($cid) {
if (!$url || !$uid) {
$contact = DBA::selectFirst('contact', ['poco', 'uid'], ['id' => $cid]);
if (DBM::is_result($contact)) {
if (DBA::is_result($contact)) {
$url = $contact['poco'];
$uid = $contact['uid'];
}
@ -285,7 +284,7 @@ class PortableContact
dbesc(normalise_link($server_url))
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
return $server_url;
}
@ -310,7 +309,7 @@ class PortableContact
dbesc(normalise_link($profile))
);
if (!DBM::is_result($gcontacts)) {
if (!DBA::is_result($gcontacts)) {
return false;
}
@ -931,7 +930,7 @@ class PortableContact
}
$gserver = DBA::selectFirst('gserver', [], ['nurl' => normalise_link($server_url)]);
if (DBM::is_result($gserver)) {
if (DBA::is_result($gserver)) {
if ($gserver["created"] <= NULL_DATE) {
$fields = ['created' => DateTimeFormat::utcNow()];
$condition = ['nurl' => normalise_link($server_url)];
@ -1002,7 +1001,7 @@ class PortableContact
// Quit if there is a timeout.
// But we want to make sure to only quit if we are mostly sure that this server url fits.
if (DBM::is_result($gserver) && ($orig_server_url == $server_url) &&
if (DBA::is_result($gserver) && ($orig_server_url == $server_url) &&
(!empty($serverret["errno"]) && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT))) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
@ -1421,7 +1420,7 @@ class PortableContact
}
$gserver = DBA::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => normalise_link($server_url)]);
if (!DBM::is_result($gserver)) {
if (!DBA::is_result($gserver)) {
return;
}
@ -1483,7 +1482,7 @@ class PortableContact
dbesc(NETWORK_OSTATUS)
);
if (!DBM::is_result($r)) {
if (!DBA::is_result($r)) {
return false;
}
@ -1511,7 +1510,7 @@ class PortableContact
$server_url = str_replace("/index.php", "", $server->url);
$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
if (!DBM::is_result($r)) {
if (!DBA::is_result($r)) {
logger("Call server check for server ".$server_url, LOGGER_DEBUG);
Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $server_url);
}
@ -1580,7 +1579,7 @@ class PortableContact
public static function discoverSingleServer($id)
{
$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
if (!DBM::is_result($r)) {
if (!DBA::is_result($r)) {
return false;
}
@ -1656,7 +1655,7 @@ class PortableContact
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
$r = q("SELECT `id`, `url`, `nurl`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
foreach ($r as $server) {
if (!self::checkServer($server["url"], $server["network"])) {
// The server is not reachable? Okay, then we will try it later