Merge branch 'develop' into issue/3878-move-Contact-to-src

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 956c2a9f6db0d50a36bd8fa64d52f4dff62542f9..ef75d416f6f43a45eef554f4fba06450444d7b14 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -7,10 +7,11 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
+use Friendica\Object\Contact;
 
 require_once "include/contact_selectors.php";
 require_once "include/contact_widgets.php";
-require_once "include/DirSearch.php";
 require_once "include/features.php";
 require_once "mod/proxy.php";
 
@@ -59,10 +60,9 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
        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;
@@ -692,7 +692,7 @@ function acl_lookup(App $a, $out_type = 'json') {
                );
                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(
@@ -779,7 +779,7 @@ function navbar_complete(App $a) {
        }
 
        if ($localsearch) {
-               $x = DirSearch::global_search_by_name($search, $mode);
+               $x = GlobalContact::searchByName($search, $mode);
                return $x;
        }