friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix wrong uses of dba::select 

- Improve negative conditions
pull/4046/head
Hypolite Petovan 2017-12-10 01:06:12 -05:00
parent 4fe8dab08d
commit 3ea9060259
1 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/Model/Group.php
View File

@ -209,7 +209,7 @@ class Group extends BaseObject
*/
public static function addMember($gid, $cid)
{
if (!($gid && $cid)) {
if (!$gid || !$cid) {
return false;
}
@ -233,11 +233,7 @@ class Group extends BaseObject
*/
public static function removeMember($gid, $cid)
{
if (!$gid) {
return false;
}
if (!($gid && $cid)) {
if (!$gid || !$cid) {
return false;
}
@ -275,7 +271,7 @@ class Group extends BaseObject
*/
public static function expand($group_ids, $check_dead = false, $use_gcontact = false)
{
if (!(is_array($group_ids) && count($group_ids))) {
if (!is_array($group_ids) || !count($group_ids)) {
return [];
}
@ -292,11 +288,9 @@ class Group extends BaseObject
$stmt = dba::select('group_member', ['contact-id'], $condition_array);
}
$return = array();
if (DBM::is_result($stmt)) {
while($group_member = dba::fetch($stmt)) {
$return[] = $group_member['contact-id'];
}
$return = [];
while($group_member = dba::fetch($stmt)) {
$return[] = $group_member['contact-id'];
}
if ($check_dead && !$use_gcontact) {
@ -318,7 +312,7 @@ class Group extends BaseObject
{
$o = '';
$groups = dba::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name' => 'ASC']]);
$stmt = dba::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name' => 'ASC']]);
$display_groups = [
[
@ -327,7 +321,7 @@ class Group extends BaseObject
'selected' => ''
]
];
foreach ($groups as $group) {
while ($group = dba::fetch($stmt)) {
$display_groups[] = [
'name' => $group['name'],
'id' => $group['id'],
@ -377,36 +371,34 @@ class Group extends BaseObject
]
];
$groups = dba::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name' => 'ASC']]);
$stmt = dba::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name' => 'ASC']]);
$member_of = array();
if ($cid) {
$member_of = self::getByContactIdForUserId(local_user(), $cid);
}
if (DBM::is_result($groups)) {
foreach ($groups as $group) {
$selected = (($group_id == $group['id']) ? ' group-selected' : '');
while ($group = dba::fetch($stmt)) {
$selected = (($group_id == $group['id']) ? ' group-selected' : '');
if ($editmode == 'full') {
$groupedit = [
'href' => 'group/' . $group['id'],
'title' => t('edit'),
];
} else {
$groupedit = null;
}
$display_groups[] = [
'id' => $group['id'],
'cid' => $cid,
'text' => $group['name'],
'href' => $each . '/' . $group['id'],
'edit' => $groupedit,
'selected' => $selected,
'ismember' => in_array($group['id'], $member_of),
if ($editmode == 'full') {
$groupedit = [
'href' => 'group/' . $group['id'],
'title' => t('edit'),
];
} else {
$groupedit = null;
}
$display_groups[] = [
'id' => $group['id'],
'cid' => $cid,
'text' => $group['name'],
'href' => $each . '/' . $group['id'],
'edit' => $groupedit,
'selected' => $selected,
'ismember' => in_array($group['id'], $member_of),
];
}
$tpl = get_markup_template('group_side.tpl');