X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=91f94155900adba71fbd74e3cb356340c2ea9465;hb=97d31255e5f0eb62adefc6b3cf3a037da49e94fb;hp=6f08523ca97dffded9ea03eb61229859667e9e45;hpb=4e49939421d39dfa971d8744691568bcdbdca15e;p=friendica.git diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 6f08523ca9..91f9415590 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -1,18 +1,22 @@ $r, 'entry' => $o); + $arr = ['group' => $r, 'entry' => $o]; // e.g. 'network_pre_group_deny', 'profile_pre_group_allow' - call_hooks($a->module . '_pre_' . $selname, $arr); + Addon::callHooks($a->module . '_pre_' . $selname, $arr); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $rr) { if ((is_array($preselected)) && in_array($rr['id'], $preselected)) { $selected = " selected=\"selected\" "; @@ -51,16 +55,15 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { } $o .= "\r\n"; - call_hooks($a->module . '_post_' . $selname, $o); + Addon::callHooks($a->module . '_post_' . $selname, $o); return $o; } -/// @TODO after an optional parameter, no mandadory parameter can follow /// @TODO find proper type-hints -function contact_selector($selname, $selclass, $preselected = false, $options) { - +function contact_selector($selname, $selclass, $options, $preselected = false) +{ $a = get_app(); $mutual = false; @@ -89,20 +92,20 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { if (x($options, 'networks')) { switch ($options['networks']) { case 'DFRN_ONLY': - $networks = array(NETWORK_DFRN); + $networks = [NETWORK_DFRN]; break; case 'PRIVATE': if (is_array($a->user) && $a->user['prvnets']) { - $networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA); + $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA]; } else { - $networks = array(NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA); + $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA]; } break; case 'TWO_WAY': if (is_array($a->user) && $a->user['prvnets']) { - $networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA); + $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA]; } else { - $networks = array(NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS); + $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS]; } break; default: /// @TODO Maybe log this call? @@ -111,9 +114,9 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { } } - $x = array('options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks); + $x = ['options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks]; - call_hooks('contact_select_options', $x); + Addon::callHooks('contact_select_options', $x); $o = ''; @@ -152,13 +155,13 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { ); - $arr = array('contact' => $r, 'entry' => $o); + $arr = ['contact' => $r, 'entry' => $o]; // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow' - call_hooks($a->module . '_pre_' . $selname, $arr); + Addon::callHooks($a->module . '_pre_' . $selname, $arr); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $rr) { if ((is_array($preselected)) && in_array($rr['id'], $preselected)) { $selected = " selected=\"selected\" "; @@ -175,7 +178,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $o .= "\r\n"; - call_hooks($a->module . '_post_' . $selname, $o); + Addon::callHooks($a->module . '_post_' . $selname, $o); return $o; } @@ -183,9 +186,6 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) { - - require_once "include/bbcode.php"; - $a = get_app(); $o = ''; @@ -230,15 +230,15 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p ); - $arr = array('contact' => $r, 'entry' => $o); + $arr = ['contact' => $r, 'entry' => $o]; // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow' - call_hooks($a->module . '_pre_' . $selname, $arr); + Addon::callHooks($a->module . '_pre_' . $selname, $arr); - $receiverlist = array(); + $receiverlist = []; - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $rr) { if ((is_array($preselected)) && in_array($rr['id'], $preselected)) { $selected = " selected=\"selected\" "; @@ -247,7 +247,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p } if ($privmail) { - $trimmed = GetProfileUsername($rr['url'], $rr['name'], false); + $trimmed = Protocol::formatMention($rr['url'], $rr['name']); } else { $trimmed = mb_substr($rr['name'],0,20); } @@ -265,14 +265,14 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= implode(", ", $receiverlist); } - call_hooks($a->module . '_post_' . $selname, $o); + Addon::callHooks($a->module . '_post_' . $selname, $o); return $o; } function fixacl(&$item) { - $item = intval(str_replace(array('<', '>'), array('', ''), $item)); + $item = intval(str_replace(['<', '>'], ['', ''], $item)); } function prune_deadguys($arr) { @@ -285,15 +285,15 @@ function prune_deadguys($arr) { $r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 "); - if (dbm::is_result($r)) { - $ret = array(); + if (DBM::is_result($r)) { + $ret = []; foreach ($r as $rr) { $ret[] = intval($rr['id']); } return $ret; } - return array(); + return []; } @@ -302,13 +302,13 @@ function get_acl_permissions($user = null) { if (is_array($user)) { $allow_cid = ((strlen($user['allow_cid'])) - ? explode('><', $user['allow_cid']) : array() ); + ? explode('><', $user['allow_cid']) : [] ); $allow_gid = ((strlen($user['allow_gid'])) - ? explode('><', $user['allow_gid']) : array() ); + ? explode('><', $user['allow_gid']) : [] ); $deny_cid = ((strlen($user['deny_cid'])) - ? explode('><', $user['deny_cid']) : array() ); + ? explode('><', $user['deny_cid']) : [] ); $deny_gid = ((strlen($user['deny_gid'])) - ? explode('><', $user['deny_gid']) : array() ); + ? explode('><', $user['deny_gid']) : [] ); array_walk($allow_cid,'fixacl'); array_walk($allow_gid,'fixacl'); array_walk($deny_cid,'fixacl'); @@ -317,12 +317,12 @@ function get_acl_permissions($user = null) { $allow_cid = prune_deadguys($allow_cid); - return array( + return [ 'allow_cid' => $allow_cid, 'allow_gid' => $allow_gid, 'deny_cid' => $deny_cid, 'deny_gid' => $deny_gid, - ); + ]; } @@ -332,7 +332,7 @@ function populate_acl($user = null, $show_jotnets = false) { $jotnets = ''; if ($show_jotnets) { - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1); $mail_enabled = false; $pubmail_enabled = false; @@ -341,7 +341,7 @@ function populate_acl($user = null, $show_jotnets = false) { $r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $mail_enabled = true; if (intval($r[0]['pubmail'])) { $pubmail_enabled = true; @@ -352,103 +352,63 @@ function populate_acl($user = null, $show_jotnets = false) { if (!$user['hidewall']) { if ($mail_enabled) { $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); - $jotnets .= '
' . t("Post to Email") . '
'; + $jotnets .= '
' . L10n::t("Post to Email") . '
'; } - call_hooks('jot_networks', $jotnets); + Addon::callHooks('jot_networks', $jotnets); } else { - $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'), - t('Hide your profile details from unknown viewers?')); + $jotnets .= L10n::t('Connectors disabled, since "%s" is enabled.', L10n::t('Hide your profile details from unknown viewers?')); } } $tpl = get_markup_template("acl_selector.tpl"); - $o = replace_macros($tpl, array( - '$showall'=> t("Visible to everybody"), - '$show' => t("show"), - '$hide' => t("don't show"), + $o = replace_macros($tpl, [ + '$showall'=> L10n::t("Visible to everybody"), + '$show' => L10n::t("show"), + '$hide' => L10n::t("don't show"), '$allowcid' => json_encode($perms['allow_cid']), '$allowgid' => json_encode($perms['allow_gid']), '$denycid' => json_encode($perms['deny_cid']), '$denygid' => json_encode($perms['deny_gid']), '$networks' => $show_jotnets, - '$emailcc' => t('CC: email addresses'), - '$emtitle' => t('Example: bob@example.com, mary@example.com'), + '$emailcc' => L10n::t('CC: email addresses'), + '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), '$jotnets' => $jotnets, - '$aclModalTitle' => t('Permissions'), - '$aclModalDismiss' => t('Close'), - '$features' => array( - 'aclautomention' => (feature_enabled($user['uid'], "aclautomention") ? "true" : "false") - ), - )); + '$aclModalTitle' => L10n::t('Permissions'), + '$aclModalDismiss' => L10n::t('Close'), + '$features' => [ + 'aclautomention' => (Feature::isEnabled($user['uid'], "aclautomention") ? "true" : "false") + ], + ]); return $o; } -function construct_acl_data(App $a, $user) { - // This function is now deactivated. It seems as if the generated data isn't used anywhere. - /// @todo Remove this function and all function calls before releasing Friendica 3.5.3 - return; - - // Get group and contact information for html ACL selector - $acl_data = acl_lookup($a, 'html'); - - $user_defaults = get_acl_permissions($user); - - if ($acl_data['groups']) { - foreach ($acl_data['groups'] as $key => $group) { - // Add a "selected" flag to groups that are posted to by default - if ($user_defaults['allow_gid'] && - in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) { - $acl_data['groups'][$key]['selected'] = 1; - } else { - $acl_data['groups'][$key]['selected'] = 0; - } - } - } - if ($acl_data['contacts']) { - foreach ($acl_data['contacts'] as $key => $contact) { - // Add a "selected" flag to groups that are posted to by default - if ($user_defaults['allow_cid'] && - in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) { - $acl_data['contacts'][$key]['selected'] = 1; - } else { - $acl_data['contacts'][$key]['selected'] = 0; - } - } - } - - return $acl_data; - -} - -function acl_lookup(App $a, $out_type = 'json') { - +function acl_lookup(App $a, $out_type = 'json') +{ if (!local_user()) { return ''; } - $start = (x($_REQUEST,'start') ? $_REQUEST['start'] : 0); - $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 100); - $search = (x($_REQUEST,'search') ? $_REQUEST['search'] : ""); - $type = (x($_REQUEST,'type') ? $_REQUEST['type'] : ""); - $mode = (x($_REQUEST,'smode') ? $_REQUEST['smode'] : ""); - $conv_id = (x($_REQUEST,'conversation') ? $_REQUEST['conversation'] : null); + $start = defaults($_REQUEST, 'start' , 0); + $count = defaults($_REQUEST, 'count' , 100); + $search = defaults($_REQUEST, 'search' , ''); + $type = defaults($_REQUEST, 'type' , ''); + $conv_id = defaults($_REQUEST, 'conversation', null); // For use with jquery.textcomplete for private mail completion - - if (x($_REQUEST, 'query') && strlen($_REQUEST['query'])) { + if (x($_REQUEST, 'query')) { if (! $type) { $type = 'm'; } $search = $_REQUEST['query']; } - logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG); + logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG); - if ($search != "") { + if ($search != '') { $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'"; $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')"; } else { @@ -466,62 +426,65 @@ function acl_lookup(App $a, $out_type = 'json') { $group_count = 0; } - $sql_extra2 .= " ".unavailable_networks(); + $sql_extra2 .= " ".Widget::unavailableNetworks(); if ($type == '' || $type == 'c') { // autocomplete for editor mentions $r = q("SELECT COUNT(*) AS c FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` + AND `success_update` >= `failure_update` AND `notify` != '' $sql_extra2" , intval(local_user()) ); $contact_count = (int)$r[0]['c']; - } - elseif ($type == 'm') { - + } elseif ($type == 'f') { + // autocomplete for editor mentions of forums + $r = q("SELECT COUNT(*) AS c FROM `contact` + WHERE `uid` = %d AND NOT `self` + AND NOT `blocked` AND NOT `pending` AND NOT `archive` + AND (`forum` OR `prv`) + AND `success_update` >= `failure_update` + AND `notify` != '' $sql_extra2" , + intval(local_user()) + ); + $contact_count = (int)$r[0]['c']; + } elseif ($type == 'm') { // autocomplete for Private Messages - $r = q("SELECT COUNT(*) AS c FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `network` IN ('%s','%s','%s') $sql_extra2" , + AND `success_update` >= `failure_update` + AND `network` IN ('%s', '%s') $sql_extra2" , intval(local_user()), dbesc(NETWORK_DFRN), - dbesc(NETWORK_ZOT), dbesc(NETWORK_DIASPORA) ); $contact_count = (int)$r[0]['c']; - } - elseif ($type == 'a') { - + } elseif ($type == 'a') { // autocomplete for Contacts - $r = q("SELECT COUNT(*) AS c FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra2" , intval(local_user()) ); $contact_count = (int)$r[0]['c']; - } else { $contact_count = 0; } + $tot = $group_count + $contact_count; - $tot = $group_count+$contact_count; - - $groups = array(); - $contacts = array(); + $groups = []; + $contacts = []; if ($type == '' || $type == 'g') { - /// @todo We should cache this query. // This can be done when we can delete cache entries via wildcard $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids FROM `group` - INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid` + INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` WHERE NOT `group`.`deleted` AND `group`.`uid` = %d $sql_extra GROUP BY `group`.`name`, `group`.`id` @@ -533,8 +496,7 @@ function acl_lookup(App $a, $out_type = 'json') { ); foreach ($r as $g) { -// logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']); - $groups[] = array( + $groups[] = [ "type" => "g", "photo" => "images/twopeople.png", "name" => htmlentities($g['name']), @@ -542,15 +504,17 @@ function acl_lookup(App $a, $out_type = 'json') { "uids" => array_map("intval", explode(",",$g['uids'])), "link" => '', "forum" => '0' - ); + ]; + } + if ((count($groups) > 0) && ($search == "")) { + $groups[] = ["separator" => true]; } } if ($type == '') { - - $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`, (`prv` OR `forum`) AS `frm` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' - AND NOT (`network` IN ('%s', '%s')) + AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s', '%s')) $sql_extra2 ORDER BY `name` ASC ", intval(local_user()), @@ -559,27 +523,35 @@ function acl_lookup(App $a, $out_type = 'json') { } elseif ($type == 'c') { $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` != '' - AND NOT (`network` IN ('%s')) + AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s')) $sql_extra2 ORDER BY `name` ASC ", intval(local_user()), dbesc(NETWORK_STATUSNET) ); - } - elseif ($type == 'm') { + } elseif ($type == 'f') { + $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` != '' + AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s')) + AND (`forum` OR `prv`) + $sql_extra2 + ORDER BY `name` ASC ", + intval(local_user()), + dbesc(NETWORK_STATUSNET) + ); + } elseif ($type == 'm') { $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` - AND `network` IN ('%s','%s','%s') + AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s') $sql_extra2 ORDER BY `name` ASC ", intval(local_user()), dbesc(NETWORK_DFRN), - dbesc(NETWORK_ZOT), dbesc(NETWORK_DIASPORA) ); } elseif ($type == 'a') { $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` - WHERE `uid` = %d AND `pending` = 0 + WHERE `uid` = %d AND `pending` = 0 AND `success_update` >= `failure_update` $sql_extra2 ORDER BY `name` ASC ", intval(local_user()) @@ -587,34 +559,34 @@ function acl_lookup(App $a, $out_type = 'json') { } elseif ($type == 'x') { // autocomplete for global contact search (e.g. navbar search) $r = navbar_complete($a); - $contacts = array(); + $contacts = []; if ($r) { foreach ($r as $g) { - $contacts[] = array( + $contacts[] = [ 'photo' => proxy_url($g['photo'], false, PROXY_SIZE_MICRO), 'name' => $g['name'], 'nick' => (x($g['addr']) ? $g['addr'] : $g['url']), 'network' => $g['network'], 'link' => $g['url'], 'forum' => (x($g['community']) ? 1 : 0), - ); + ]; } } - $o = array( + $o = [ 'start' => $start, 'count' => $count, 'items' => $contacts, - ); + ]; echo json_encode($o); killme(); } else { - $r = array(); + $r = []; } - - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { + $forums = []; foreach ($r as $g) { - $contacts[] = array( + $entry = [ 'type' => 'c', 'photo' => proxy_url($g['micro'], false, PROXY_SIZE_MICRO), 'name' => htmlentities($g['name']), @@ -624,12 +596,31 @@ function acl_lookup(App $a, $out_type = 'json') { '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), - ); + ]; + if ($entry['forum']) { + $forums[] = $entry; + } else { + $contacts[] = $entry; + } + } + if (count($forums) > 0) { + if ($search == "") { + $forums[] = ["separator" => true]; + } + $contacts = array_merge($forums, $contacts); } } $items = array_merge($groups, $contacts); + // At multi threaded posts the conv_id is not the parent of the whole thread + if ($conv_id > 0) { + $parent_item = dba::selectFirst('item', ['parent'], ['id' => $conv_id]); + if (DBM::is_result($parent_item)) { + $conv_id = $parent_item['parent']; + } + } + if ($conv_id) { /* * if $conv_id is set, get unknown contacts in thread @@ -641,7 +632,7 @@ function acl_lookup(App $a, $out_type = 'json') { } , $contacts); - $unknown_contacts = array(); + $unknown_contacts = []; $r = q("SELECT `author-link` FROM `item` WHERE `parent` = %d AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%') @@ -654,12 +645,12 @@ function acl_lookup(App $a, $out_type = 'json') { dbesc($search), implode("', '", $known_contacts) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $row) { - $contact = get_contact_details_by_url($row['author-link']); + $contact = Contact::getDetailsByURL($row['author-link']); if (count($contact) > 0) { - $unknown_contacts[] = array( + $unknown_contacts[] = [ 'type' => 'c', 'photo' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO), 'name' => htmlentities($contact['name']), @@ -669,7 +660,7 @@ function acl_lookup(App $a, $out_type = 'json') { 'nick' => htmlentities($contact['nick'] ? : $contact['addr']), 'addr' => htmlentities(($contact['addr']) ? $contact['addr'] : $contact['url']), 'forum' => $contact['forum'] - ); + ]; } } } @@ -678,7 +669,7 @@ function acl_lookup(App $a, $out_type = 'json') { $tot += count($unknown_contacts); } - $results = array( + $results = [ 'tot' => $tot, 'start' => $start, 'count' => $count, @@ -687,27 +678,27 @@ function acl_lookup(App $a, $out_type = 'json') { 'items' => $items, 'type' => $type, 'search' => $search, - ); + ]; - call_hooks('acl_lookup_end', $results); + Addon::callHooks('acl_lookup_end', $results); if ($out_type === 'html') { - $o = array( + $o = [ 'tot' => $results['tot'], 'start' => $results['start'], 'count' => $results['count'], 'groups' => $results['groups'], 'contacts' => $results['contacts'], - ); + ]; return $o; } - $o = array( + $o = [ 'tot' => $results['tot'], 'start' => $results['start'], 'count' => $results['count'], 'items' => $results['items'], - ); + ]; echo json_encode($o); @@ -723,19 +714,19 @@ function navbar_complete(App $a) { // logger('navbar_complete'); - if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { return; } // check if searching in the local global contact table is enabled - $localsearch = get_config('system','poco_local_search'); + $localsearch = Config::get('system','poco_local_search'); - $search = $prefix.notags(trim($_REQUEST['search'])); + $search = notags(trim($_REQUEST['search'])); $mode = $_REQUEST['smode']; // don't search if search term has less than 2 characters if (! $search || mb_strlen($search) < 2) { - return array(); + return []; } if (substr($search,0,1) === '@') { @@ -743,18 +734,17 @@ function navbar_complete(App $a) { } if ($localsearch) { - $x = DirSearch::global_search_by_name($search, $mode); + $x = GContact::searchByName($search, $mode); return $x; } if (! $localsearch) { $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); - $x = z_fetch_url(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search)); + $x = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search)); if ($x['success']) { - $t = 0; $j = json_decode($x['body'],true); - if ($j && $j['results']) { + if ($j && isset($j['results'])) { return $j['results']; } }