Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 11:44:24 +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

15
src/Worker/OnePoll.php
View file

@ -9,7 +9,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Protocol\Email;
@ -48,7 +47,7 @@ class OnePoll
$d = DateTimeFormat::utcNow();
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
if (!DBM::is_result($contact)) {
if (!DBA::is_result($contact)) {
logger('Contact not found or cannot be used.');
return;
}
@ -61,7 +60,7 @@ class OnePoll
WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
intval($contact['id'])
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
if (!$r[0]['total']) {
PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
}
@ -146,7 +145,7 @@ class OnePoll
intval($importer_uid)
);
if (!DBM::is_result($r)) {
if (!DBA::is_result($r)) {
logger('No self contact for user '.$importer_uid);
// set the last-update so we don't keep polling
@ -349,7 +348,7 @@ class OnePoll
$condition = ["`server` != '' AND `uid` = ?", $importer_uid];
$mailconf = DBA::selectFirst('mailacct', [], $condition);
if (DBM::is_result($user) && DBM::is_result($mailconf)) {
if (DBA::is_result($user) && DBA::is_result($mailconf)) {
$mailbox = Email::constructMailboxName($mailconf);
$password = '';
openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
@ -392,7 +391,7 @@ class OnePoll
$fields = ['deleted', 'id'];
$condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
$item = Item::selectFirst($fields, $condition);
if (DBM::is_result($item)) {
if (DBA::is_result($item)) {
logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
// Only delete when mails aren't automatically moved or deleted
@ -442,7 +441,7 @@ class OnePoll
}
$condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
$parent = Item::selectFirst(['parent-uri'], $condition);
if (DBM::is_result($parent)) {
if (DBA::is_result($parent)) {
$datarray['parent-uri'] = $parent['parent-uri']; // Set the parent as the top-level item
}
}
@ -475,7 +474,7 @@ class OnePoll
$condition = ['title' => $datarray['title'], 'uid' => importer_uid, 'network' => NETWORK_MAIL];
$params = ['order' => ['created' => true]];
$parent = Item::selectFirst(['parent-uri'], $condition, $params);
if (DBM::is_result($parent)) {
if (DBA::is_result($parent)) {
$datarray['parent-uri'] = $parent['parent-uri'];
}
}