Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 02:30:11 +00: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

19
include/security.php
View file

@ -9,7 +9,6 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Group;
use Friendica\Util\DateTimeFormat;
@ -101,7 +100,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
$user = DBA::selectFirst('user', [], ['uid' => $_SESSION['submanage']]);
if (DBM::is_result($user)) {
if (DBA::is_result($user)) {
$master_record = $user;
}
}
@ -115,7 +114,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
// Then add all the children
$r = DBA::select('user', ['uid', 'username', 'nickname'],
['parent-uid' => $master_record['uid'], 'account_removed' => false]);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$a->identities = array_merge($a->identities, DBA::toArray($r));
}
} else {
@ -125,14 +124,14 @@ function authenticate_success($user_record, $login_initial = false, $interactive
// First entry is our parent
$r = DBA::select('user', ['uid', 'username', 'nickname'],
['uid' => $master_record['parent-uid'], 'account_removed' => false]);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$a->identities = DBA::toArray($r);
}
// Then add all siblings
$r = DBA::select('user', ['uid', 'username', 'nickname'],
['parent-uid' => $master_record['parent-uid'], 'account_removed' => false]);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$a->identities = array_merge($a->identities, DBA::toArray($r));
}
}
@ -143,7 +142,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
$master_record['uid']
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$a->identities = array_merge($a->identities, DBA::toArray($r));
}
@ -155,7 +154,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
}
$contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]);
if (DBM::is_result($contact)) {
if (DBA::is_result($contact)) {
$a->contact = $contact;
$a->cid = $contact['id'];
$_SESSION['cid'] = $a->cid;
@ -247,7 +246,7 @@ function can_write_wall($owner)
intval(PAGE_COMMUNITY)
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$verified = 2;
return true;
} else {
@ -302,7 +301,7 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
intval($remote_user),
intval($owner_id)
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$remote_verified = true;
$groups = Group::getIdsByContactId($remote_user);
}
@ -365,7 +364,7 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
intval($remote_user),
intval($owner_id)
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$remote_verified = true;
$groups = Group::getIdsByContactId($remote_user);
}