Merge pull request #4581 from annando/issue-4497

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 166cf97197a2c4a80a0f35f4ec62f6dddaf33dcc..e69ac36f683c20a329d6f8676053a9a06a8a1684 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -9,11 +9,11 @@ use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\Network;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Util\Network as NetworkUtil;
+use Friendica\Util\Network;
 
 require_once "mod/proxy.php";
 
@@ -186,9 +186,6 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
 
 
 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 = '';
@@ -250,7 +247,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                        }
 
                        if ($privmail) {
-                               $trimmed = Network::formatMention($rr['url'], $rr['name']);
+                               $trimmed = Protocol::formatMention($rr['url'], $rr['name']);
                        } else {
                                $trimmed = mb_substr($rr['name'],0,20);
                        }
@@ -716,7 +713,7 @@ function navbar_complete(App $a) {
        // check if searching in the local global contact table is enabled
        $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
@@ -736,7 +733,7 @@ function navbar_complete(App $a) {
        if (! $localsearch) {
                $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
-               $x = NetworkUtil::curl(get_server() . '/lsearch?f=' . $p .  '&search=' . urlencode($search));
+               $x = Network::curl(get_server() . '/lsearch?f=' . $p .  '&search=' . urlencode($search));
                if ($x['success']) {
                        $j = json_decode($x['body'],true);
                        if ($j && isset($j['results'])) {