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

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

View file

@ -6,7 +6,7 @@ namespace Friendica\Model;
use Friendica\BaseObject;
use Friendica\Core\L10n;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
require_once 'boot.php';
@ -38,17 +38,17 @@ class Group extends BaseObject
// all the old members are gone, but the group remains so we don't break any security
// access lists. What we're doing here is reviving the dead group, but old content which
// was restricted to this group may now be seen by the new group members.
$group = dba::selectFirst('group', ['deleted'], ['id' => $gid]);
$group = DBA::selectFirst('group', ['deleted'], ['id' => $gid]);
if (DBM::is_result($group) && $group['deleted']) {
dba::update('group', ['deleted' => 0], ['id' => $gid]);
DBA::update('group', ['deleted' => 0], ['id' => $gid]);
notice(L10n::t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL);
}
return true;
}
$return = dba::insert('group', ['uid' => $uid, 'name' => $name]);
$return = DBA::insert('group', ['uid' => $uid, 'name' => $name]);
if ($return) {
$return = dba::lastInsertId();
$return = DBA::lastInsertId();
}
}
return $return;
@ -64,7 +64,7 @@ class Group extends BaseObject
*/
public static function update($id, $name)
{
return dba::update('group', ['name' => $name], ['id' => $id]);
return DBA::update('group', ['name' => $name], ['id' => $id]);
}
/**
@ -76,11 +76,11 @@ class Group extends BaseObject
public static function getIdsByContactId($cid)
{
$condition = ['contact-id' => $cid];
$stmt = dba::select('group_member', ['gid'], $condition);
$stmt = DBA::select('group_member', ['gid'], $condition);
$return = [];
while ($group = dba::fetch($stmt)) {
while ($group = DBA::fetch($stmt)) {
$return[] = $group['gid'];
}
@ -99,7 +99,7 @@ class Group extends BaseObject
*/
public static function countUnseen()
{
$stmt = dba::p("SELECT `group`.`id`, `group`.`name`,
$stmt = DBA::p("SELECT `group`.`id`, `group`.`name`,
(SELECT COUNT(*) FROM `item` FORCE INDEX (`uid_unseen_contactid`)
WHERE `uid` = ?
AND `unseen`
@ -114,7 +114,7 @@ class Group extends BaseObject
local_user()
);
return dba::inArray($stmt);
return DBA::inArray($stmt);
}
/**
@ -132,7 +132,7 @@ class Group extends BaseObject
return false;
}
$group = dba::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]);
$group = DBA::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]);
if (DBM::is_result($group)) {
return $group['id'];
}
@ -151,13 +151,13 @@ class Group extends BaseObject
return false;
}
$group = dba::selectFirst('group', ['uid'], ['id' => $gid]);
$group = DBA::selectFirst('group', ['uid'], ['id' => $gid]);
if (!DBM::is_result($group)) {
return false;
}
// remove group from default posting lists
$user = dba::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]);
$user = DBA::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]);
if (DBM::is_result($user)) {
$change = false;
@ -175,15 +175,15 @@ class Group extends BaseObject
}
if ($change) {
dba::update('user', $user, ['uid' => $group['uid']]);
DBA::update('user', $user, ['uid' => $group['uid']]);
}
}
// remove all members
dba::delete('group_member', ['gid' => $gid]);
DBA::delete('group_member', ['gid' => $gid]);
// remove group
$return = dba::update('group', ['deleted' => 1], ['id' => $gid]);
$return = DBA::update('group', ['deleted' => 1], ['id' => $gid]);
return $return;
}
@ -221,12 +221,12 @@ class Group extends BaseObject
return false;
}
$row_exists = dba::exists('group_member', ['gid' => $gid, 'contact-id' => $cid]);
$row_exists = DBA::exists('group_member', ['gid' => $gid, 'contact-id' => $cid]);
if ($row_exists) {
// Row already existing, nothing to do
$return = true;
} else {
$return = dba::insert('group_member', ['gid' => $gid, 'contact-id' => $cid]);
$return = DBA::insert('group_member', ['gid' => $gid, 'contact-id' => $cid]);
}
return $return;
@ -245,7 +245,7 @@ class Group extends BaseObject
return false;
}
$return = dba::delete('group_member', ['gid' => $gid, 'contact-id' => $cid]);
$return = DBA::delete('group_member', ['gid' => $gid, 'contact-id' => $cid]);
return $return;
}
@ -293,11 +293,11 @@ class Group extends BaseObject
$stmt = call_user_func_array('dba::p', $param_arr);
} else {
$condition_array = array_merge([$condition], $group_ids);
$stmt = dba::select('group_member', ['contact-id'], $condition_array);
$stmt = DBA::select('group_member', ['contact-id'], $condition_array);
}
$return = [];
while($group_member = dba::fetch($stmt)) {
while($group_member = DBA::fetch($stmt)) {
$return[] = $group_member['contact-id'];
}
@ -319,7 +319,7 @@ class Group extends BaseObject
{
$o = '';
$stmt = dba::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name']]);
$stmt = DBA::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name']]);
$display_groups = [
[
@ -328,7 +328,7 @@ class Group extends BaseObject
'selected' => ''
]
];
while ($group = dba::fetch($stmt)) {
while ($group = DBA::fetch($stmt)) {
$display_groups[] = [
'name' => $group['name'],
'id' => $group['id'],
@ -378,14 +378,14 @@ class Group extends BaseObject
]
];
$stmt = dba::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name']]);
$stmt = DBA::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name']]);
$member_of = [];
if ($cid) {
$member_of = self::getIdsByContactId($cid);
}
while ($group = dba::fetch($stmt)) {
while ($group = DBA::fetch($stmt)) {
$selected = (($group_id == $group['id']) ? ' group-selected' : '');
if ($editmode == 'full') {