MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Prettify mod/acl

Browse source 
- 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
1 changed files with 49 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
mod/acl.php
View file

@ -18,14 +18,14 @@ function acl_content(App $a)
return ''; return '';
} }
$start = defaults($_REQUEST, 'start', 0); $start = defaults($_REQUEST, 'start' , 0);
$count = defaults($_REQUEST, 'count', 100); $count = defaults($_REQUEST, 'count' , 100);
$search = defaults($_REQUEST, 'search', ''); $search = defaults($_REQUEST, 'search' , '');
$type = defaults($_REQUEST, 'type', ''); $type = defaults($_REQUEST, 'type' , '');
$conv_id = defaults($_REQUEST, 'conversation', null); $conv_id = defaults($_REQUEST, 'conversation', null);
// For use with jquery.textcomplete for private mail completion // For use with jquery.textcomplete for private mail completion
if (x($_REQUEST, 'query')) { if (!empty($_REQUEST['query'])) {
if (!$type) { if (!$type) {
$type = 'm'; $type = 'm';
} }
@ -43,17 +43,17 @@ function acl_content(App $a)
} }
// count groups and contacts // count groups and contacts
$group_count = 0;
if ($type == '' || $type == 'g') { if ($type == '' || $type == 'g') {
$r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra", $r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
intval(local_user()) intval(local_user())
); );
$group_count = (int) $r[0]['g']; $group_count = (int) $r[0]['g'];
} else {
$group_count = 0;
} }
$sql_extra2 .= ' ' . Widget::unavailableNetworks(); $sql_extra2 .= ' ' . Widget::unavailableNetworks();
$contact_count = 0;
if ($type == '' || $type == 'c') { if ($type == '' || $type == 'c') {
// autocomplete for editor mentions // autocomplete for editor mentions
$r = q("SELECT COUNT(*) AS c FROM `contact` $r = q("SELECT COUNT(*) AS c FROM `contact`
@ -95,8 +95,6 @@ function acl_content(App $a)
intval(local_user()) intval(local_user())
); );
$contact_count = (int) $r[0]['c']; $contact_count = (int) $r[0]['c'];
} else {
$contact_count = 0;
} }
$tot = $group_count + $contact_count; $tot = $group_count + $contact_count;
@ -122,12 +120,12 @@ function acl_content(App $a)
foreach ($r as $g) { foreach ($r as $g) {
$groups[] = [ $groups[] = [
'type' => 'g', 'type' => 'g',
'photo' => 'images/twopeople.png', 'photo' => 'images/twopeople.png',
'name' => htmlentities($g['name']), 'name' => htmlentities($g['name']),
'id' => intval($g['id']), 'id' => intval($g['id']),
'uids' => array_map('intval', explode(',', $g['uids'])), 'uids' => array_map('intval', explode(',', $g['uids'])),
'link' => '', 'link' => '',
'forum' => '0' 'forum' => '0'
]; ];
} }
@ -136,50 +134,51 @@ function acl_content(App $a)
} }
} }
$r = [];
if ($type == '') { if ($type == '') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv`, (`prv` OR `forum`) AS `frm` FROM `contact` $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` != '' WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s', '%s')) AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s', '%s'))
$sql_extra2 $sql_extra2
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
intval(local_user()), intval(local_user()),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_STATUSNET) dbesc(NETWORK_STATUSNET)
); );
} elseif ($type == 'c') { } elseif ($type == 'c') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s')) AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s'))
$sql_extra2 $sql_extra2
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
intval(local_user()), intval(local_user()),
dbesc(NETWORK_STATUSNET) dbesc(NETWORK_STATUSNET)
); );
} elseif ($type == 'f') { } elseif ($type == 'f') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s')) AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s'))
AND (`forum` OR `prv`) AND (`forum` OR `prv`)
$sql_extra2 $sql_extra2
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
intval(local_user()), intval(local_user()),
dbesc(NETWORK_STATUSNET) dbesc(NETWORK_STATUSNET)
); );
} elseif ($type == 'm') { } elseif ($type == 'm') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact` $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact`
WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive`
AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s') AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s')
$sql_extra2 $sql_extra2
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
intval(local_user()), intval(local_user()),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
dbesc(NETWORK_DIASPORA) dbesc(NETWORK_DIASPORA)
); );
} elseif ($type == 'a') { } elseif ($type == 'a') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
WHERE `uid` = %d AND `pending` = 0 AND `success_update` >= `failure_update` WHERE `uid` = %d AND `pending` = 0 AND `success_update` >= `failure_update`
$sql_extra2 $sql_extra2
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
intval(local_user()) intval(local_user())
); );
} elseif ($type == 'x') { } elseif ($type == 'x') {
@ -194,10 +193,10 @@ function acl_content(App $a)
$contacts[] = [ $contacts[] = [
'photo' => proxy_url($g['photo'], false, PROXY_SIZE_MICRO), 'photo' => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
'name' => $g['name'], 'name' => $g['name'],
'nick' => (x($g['addr']) ? $g['addr'] : $g['url']), 'nick' => defaults($g, 'addr', $g['url']),
'network' => $g['network'], 'network' => $g['network'],
'link' => $g['url'], 'link' => $g['url'],
'forum' => (x($g['community']) ? 1 : 0), 'forum' => !empty($g['community']) ? 1 : 0,
]; ];
} }
$o = [ $o = [
@ -206,9 +205,7 @@ function acl_content(App $a)
'items' => $contacts, 'items' => $contacts,
]; ];
echo json_encode($o); echo json_encode($o);
killme(); exit;
} else {
$r = [];
} }
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
@ -221,9 +218,9 @@ function acl_content(App $a)
'id' => intval($g['id']), 'id' => intval($g['id']),
'network' => $g['network'], 'network' => $g['network'],
'link' => $g['url'], 'link' => $g['url'],
'nick' => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']), 'nick' => htmlentities(defaults($g, 'attag', $g['nick'])),
'addr' => htmlentities(($g['addr']) ? $g['addr'] : $g['url']), 'addr' => htmlentities(defaults($g, 'addr', $g['url'])),
'forum' => ((x($g, 'forum') || x($g, 'prv')) ? 1 : 0), 'forum' => !empty($g['forum']) || !empty($g['prv']) ? 1 : 0,
]; ];
if ($entry['forum']) { if ($entry['forum']) {
$forums[] = $entry; $forums[] = $entry;
@ -269,15 +266,15 @@ function acl_content(App $a)
if (count($contact) > 0) { if (count($contact) > 0) {
$unknown_contacts[] = [ $unknown_contacts[] = [
'type' => 'c', 'type' => 'c',
'photo' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO), 'photo' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
'name' => htmlentities($contact['name']), 'name' => htmlentities($contact['name']),
'id' => intval($contact['cid']), 'id' => intval($contact['cid']),
'network' => $contact['network'], 'network' => $contact['network'],
'link' => $contact['url'], 'link' => $contact['url'],
'nick' => htmlentities($contact['nick'] ?: $contact['addr']), 'nick' => htmlentities(defaults($contact, 'nick', $contact['addr'])),
'addr' => htmlentities(($contact['addr']) ? $contact['addr'] : $contact['url']), 'addr' => htmlentities(defaults($contact, 'addr', $contact['url'])),
'forum' => $contact['forum'] 'forum' => $contact['forum']
]; ];
} }
} }
@ -301,13 +298,12 @@ function acl_content(App $a)
Addon::callHooks('acl_lookup_end', $results); Addon::callHooks('acl_lookup_end', $results);
$o = [ $o = [
'tot' => $results['tot'], 'tot' => $results['tot'],
'start' => $results['start'], 'start' => $results['start'],
'count' => $results['count'], 'count' => $results['count'],
'items' => $results['items'], 'items' => $results['items'],
]; ];
echo json_encode($o); echo json_encode($o);
exit;
killme();
} }