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

7
src/Core/ACL.php
View file

@ -9,7 +9,6 @@ namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Content\Feature;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Util\Network;
@ -113,7 +112,7 @@ class ACL extends BaseObject
// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
Addon::callHooks($a->module . '_pre_' . $selname, $arr);
if (DBM::is_result($contacts)) {
if (DBA::is_result($contacts)) {
foreach ($contacts as $contact) {
if (in_array($contact['id'], $preselected)) {
$selected = ' selected="selected" ';
@ -180,7 +179,7 @@ class ACL extends BaseObject
$receiverlist = [];
if (DBM::is_result($contacts)) {
if (DBA::is_result($contacts)) {
foreach ($contacts as $contact) {
if (in_array($contact['id'], $preselected)) {
$selected = ' selected="selected"';
@ -274,7 +273,7 @@ class ACL extends BaseObject
if (!$imap_disabled) {
$mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
if (DBM::is_result($mailacct)) {
if (DBA::is_result($mailacct)) {
$mail_enabled = true;
$pubmail_enabled = !empty($mailacct['pubmail']);
}

3
src/Core/Addon.php
View file

@ -6,7 +6,6 @@ namespace Friendica\Core;
use Friendica\App;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
require_once 'include/dba.php';
@ -80,7 +79,7 @@ class Addon
$addons = Config::get('system', 'addon');
if (strlen($addons)) {
$r = DBA::select('addon', [], ['installed' => 1]);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$installed = DBA::toArray($r);
} else {
$installed = [];

3
src/Core/Cache/DatabaseCacheDriver.php
View file

@ -4,7 +4,6 @@ namespace Friendica\Core\Cache;
use Friendica\Core\Cache;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat;
/**
@ -18,7 +17,7 @@ class DatabaseCacheDriver extends AbstractCacheDriver implements ICacheDriver
{
$cache = DBA::selectFirst('cache', ['v'], ['`k` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
if (DBM::is_result($cache)) {
if (DBA::is_result($cache)) {
$cached = $cache['v'];
$value = @unserialize($cached);

3
src/Core/Config/JITConfigAdapter.php
View file

@ -3,7 +3,6 @@ namespace Friendica\Core\Config;
use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
require_once 'include/dba.php';
@ -57,7 +56,7 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
}
$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
if (DBM::is_result($config)) {
if (DBA::is_result($config)) {
// manage array value
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);

5
src/Core/Config/JITPConfigAdapter.php
View file

@ -3,7 +3,6 @@ namespace Friendica\Core\Config;
use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
require_once 'include/dba.php';
@ -23,7 +22,7 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
$a = self::getApp();
$pconfigs = DBA::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
if (DBM::is_result($pconfigs)) {
if (DBA::is_result($pconfigs)) {
while ($pconfig = DBA::fetch($pconfigs)) {
$k = $pconfig['k'];
@ -59,7 +58,7 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
}
$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
if (DBM::is_result($pconfig)) {
if (DBA::is_result($pconfig)) {
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
self::getApp()->setPConfigValue($uid, $cat, $k, $val);

3
src/Core/Config/PreloadConfigAdapter.php
View file

@ -5,7 +5,6 @@ namespace Friendica\Core\Config;
use Exception;
use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
require_once 'include/dba.php';
@ -44,7 +43,7 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
{
if ($refresh) {
$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
if (DBM::is_result($config)) {
if (DBA::is_result($config)) {
self::getApp()->setConfigValue($cat, $k, $config['v']);
}
}

3
src/Core/Config/PreloadPConfigAdapter.php
View file

@ -5,7 +5,6 @@ namespace Friendica\Core\Config;
use Exception;
use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
require_once 'include/dba.php';
@ -52,7 +51,7 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
if ($refresh) {
$config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
if (DBM::is_result($config)) {
if (DBA::is_result($config)) {
self::getApp()->setPConfigValue($uid, $cat, $k, $config['v']);
} else {
self::getApp()->deletePConfigValue($uid, $cat, $k);

3
src/Core/Console/GlobalCommunitySilence.php
View file

@ -4,7 +4,6 @@ namespace Friendica\Core\Console;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Network\Probe;
use RuntimeException;
@ -82,7 +81,7 @@ HELP;
$nurl = normalise_link($net['url']);
$contact = DBA::selectFirst("contact", ["id"], ["nurl" => $nurl, "uid" => 0]);
if (DBM::is_result($contact)) {
if (DBA::is_result($contact)) {
DBA::update("contact", ["hidden" => true], ["id" => $contact["id"]]);
$this->out('NOTICE: The account should be silenced from the global community page');
} else {

3
src/Core/Console/NewPassword.php
View file

@ -5,7 +5,6 @@ namespace Friendica\Core\Console;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\User;
use RuntimeException;
@ -65,7 +64,7 @@ HELP;
$nick = $this->getArgument(0);
$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
if (!DBM::is_result($user)) {
if (!DBA::is_result($user)) {
throw new RuntimeException(L10n::t('User not found'));
}

5
src/Core/Lock/DatabaseLockDriver.php
View file

@ -4,7 +4,6 @@ namespace Friendica\Core\Lock;
use Friendica\Core\Cache;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat;
/**
@ -24,7 +23,7 @@ class DatabaseLockDriver extends AbstractLockDriver
DBA::lock('locks');
$lock = DBA::selectFirst('locks', ['locked', 'pid'], ['`name` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
if (DBM::is_result($lock)) {
if (DBA::is_result($lock)) {
if ($lock['locked']) {
// We want to lock something that was already locked by us? So we got the lock.
if ($lock['pid'] == getmypid()) {
@ -80,7 +79,7 @@ class DatabaseLockDriver extends AbstractLockDriver
{
$lock = DBA::selectFirst('locks', ['locked'], ['`name` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
if (DBM::is_result($lock)) {
if (DBA::is_result($lock)) {
return $lock['locked'] !== false;
} else {
return false;

18
src/Core/NotificationsManager.php
View file

@ -9,7 +9,7 @@ namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Database\DBM;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Util\DateTimeFormat;
@ -96,7 +96,7 @@ class NotificationsManager extends BaseObject
intval(local_user())
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
return $this->_set_extra($r);
}
@ -116,7 +116,7 @@ class NotificationsManager extends BaseObject
intval($id),
intval(local_user())
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
return $this->_set_extra($r)[0];
}
return null;
@ -224,7 +224,7 @@ class NotificationsManager extends BaseObject
$notif = [];
$arr = [];
if (DBM::is_result($notifs)) {
if (DBA::is_result($notifs)) {
foreach ($notifs as $it) {
// Because we use different db tables for the notification query
// we have sometimes $it['unseen'] and sometimes $it['seen].
@ -405,7 +405,7 @@ class NotificationsManager extends BaseObject
$items = Item::selectForUser(local_user(), $fields, $condition, $params);
if (DBM::is_result($items)) {
if (DBA::is_result($items)) {
$notifs = $this->formatNotifs(Item::inArray($items), $ident);
}
@ -447,7 +447,7 @@ class NotificationsManager extends BaseObject
intval($limit)
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident);
}
@ -492,7 +492,7 @@ class NotificationsManager extends BaseObject
$items = Item::selectForUser(local_user(), $fields, $condition, $params);
if (DBM::is_result($items)) {
if (DBA::is_result($items)) {
$notifs = $this->formatNotifs(Item::inArray($items), $ident);
}
@ -532,7 +532,7 @@ class NotificationsManager extends BaseObject
$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
$items = Item::selectForUser(local_user(), $fields, $condition, $params);
if (DBM::is_result($items)) {
if (DBA::is_result($items)) {
$notifs = $this->formatNotifs(Item::inArray($items), $ident);
}
@ -584,7 +584,7 @@ class NotificationsManager extends BaseObject
intval($start),
intval($limit)
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$notifs = $this->formatIntros($r);
}

3
src/Core/Session/DatabaseSessionHandler.php
View file

@ -5,7 +5,6 @@ namespace Friendica\Core\Session;
use Friendica\BaseObject;
use Friendica\Core\Session;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use SessionHandlerInterface;
require_once 'boot.php';
@ -31,7 +30,7 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
}
$session = DBA::selectFirst('session', ['data'], ['sid' => $session_id]);
if (DBM::is_result($session)) {
if (DBA::is_result($session)) {
Session::$exists = true;
return $session['data'];
}

15
src/Core/Worker.php
View file

@ -5,7 +5,6 @@
namespace Friendica\Core;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
@ -163,7 +162,7 @@ class Worker
{
$condition = ["`executed` <= ? AND NOT `done`", NULL_DATE];
$workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
if (DBM::is_result($workerqueue)) {
if (DBA::is_result($workerqueue)) {
return $workerqueue["priority"];
} else {
return 0;
@ -478,7 +477,7 @@ class Worker
if ($max == 0) {
// the maximum number of possible user connections can be a system variable
$r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$max = $r["Value"];
}
// Or it can be granted. This overrides the system variable
@ -514,7 +513,7 @@ class Worker
// We will now check for the system values.
// This limit could be reached although the user limits are fine.
$r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
if (!DBM::is_result($r)) {
if (!DBA::is_result($r)) {
return false;
}
$max = intval($r["Value"]);
@ -522,7 +521,7 @@ class Worker
return false;
}
$r = DBA::fetchFirst("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
if (!DBM::is_result($r)) {
if (!DBA::is_result($r)) {
return false;
}
$used = intval($r["Value"]);
@ -735,7 +734,7 @@ class Worker
);
// No active processes at all? Fine
if (!DBM::is_result($r)) {
if (!DBA::is_result($r)) {
return false;
}
$priorities = [];
@ -872,7 +871,7 @@ class Worker
// There can already be jobs for us in the queue.
$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
self::$db_duration += (microtime(true) - $stamp);
return DBA::toArray($r);
}
@ -1164,7 +1163,7 @@ class Worker
$row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => 1]);
// When we don't have a row, no job is running
if (!DBM::is_result($row)) {
if (!DBA::is_result($row)) {
return false;
}