Prettify mod/acl

- Replace obsolete x() and killme() calls
- Simplify ternary operators with defaults()
- Restore list alignment
- Extract variable initialization from else conditions
This commit is contained in:
Hypolite Petovan 2018-02-25 20:24:46 -05:00
parent 2f463dfb17
commit a6c785f693

View file

@ -25,7 +25,7 @@ function acl_content(App $a)
$conv_id = defaults($_REQUEST, 'conversation', null);
// For use with jquery.textcomplete for private mail completion
if (x($_REQUEST, 'query')) {
if (!empty($_REQUEST['query'])) {
if (!$type) {
$type = 'm';
}
@ -43,17 +43,17 @@ function acl_content(App $a)
}
// count groups and contacts
$group_count = 0;
if ($type == '' || $type == 'g') {
$r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
intval(local_user())
);
$group_count = (int) $r[0]['g'];
} else {
$group_count = 0;
}
$sql_extra2 .= ' ' . Widget::unavailableNetworks();
$contact_count = 0;
if ($type == '' || $type == 'c') {
// autocomplete for editor mentions
$r = q("SELECT COUNT(*) AS c FROM `contact`
@ -95,8 +95,6 @@ function acl_content(App $a)
intval(local_user())
);
$contact_count = (int) $r[0]['c'];
} else {
$contact_count = 0;
}
$tot = $group_count + $contact_count;
@ -136,6 +134,7 @@ function acl_content(App $a)
}
}
$r = [];
if ($type == '') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv`, (`prv` OR `forum`) AS `frm` FROM `contact`
WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
@ -194,10 +193,10 @@ function acl_content(App $a)
$contacts[] = [
'photo' => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
'name' => $g['name'],
'nick' => (x($g['addr']) ? $g['addr'] : $g['url']),
'nick' => defaults($g, 'addr', $g['url']),
'network' => $g['network'],
'link' => $g['url'],
'forum' => (x($g['community']) ? 1 : 0),
'forum' => !empty($g['community']) ? 1 : 0,
];
}
$o = [
@ -206,9 +205,7 @@ function acl_content(App $a)
'items' => $contacts,
];
echo json_encode($o);
killme();
} else {
$r = [];
exit;
}
if (DBM::is_result($r)) {
@ -221,9 +218,9 @@ function acl_content(App $a)
'id' => intval($g['id']),
'network' => $g['network'],
'link' => $g['url'],
'nick' => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']),
'addr' => htmlentities(($g['addr']) ? $g['addr'] : $g['url']),
'forum' => ((x($g, 'forum') || x($g, 'prv')) ? 1 : 0),
'nick' => htmlentities(defaults($g, 'attag', $g['nick'])),
'addr' => htmlentities(defaults($g, 'addr', $g['url'])),
'forum' => !empty($g['forum']) || !empty($g['prv']) ? 1 : 0,
];
if ($entry['forum']) {
$forums[] = $entry;
@ -275,8 +272,8 @@ function acl_content(App $a)
'id' => intval($contact['cid']),
'network' => $contact['network'],
'link' => $contact['url'],
'nick' => htmlentities($contact['nick'] ?: $contact['addr']),
'addr' => htmlentities(($contact['addr']) ? $contact['addr'] : $contact['url']),
'nick' => htmlentities(defaults($contact, 'nick', $contact['addr'])),
'addr' => htmlentities(defaults($contact, 'addr', $contact['url'])),
'forum' => $contact['forum']
];
}
@ -308,6 +305,5 @@ function acl_content(App $a)
];
echo json_encode($o);
killme();
exit;
}