Revert adding a leading slash to redir links

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 47f97250f8becc4c41db73bb8b2c2b218029e487..71a42478ba92c06b80c02f6f3d332af6382deba4 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -399,7 +399,7 @@ function acl_lookup(&$a, $out_type = 'json') {
        $count  =       (x($_REQUEST,'count')           ? $_REQUEST['count']            : 100);
        $search  =      (x($_REQUEST,'search')          ? $_REQUEST['search']           : "");
        $type   =       (x($_REQUEST,'type')            ? $_REQUEST['type']             : "");
-       $mode   =       (x($_REQUEST,'mode')            ? $_REQUEST['mode']             : "");
+       $mode   =       (x($_REQUEST,'smode')           ? $_REQUEST['smode']            : "");
        $conv_id =      (x($_REQUEST,'conversation')    ? $_REQUEST['conversation']     : null);
 
        // For use with jquery.textcomplete for private mail completion
@@ -481,11 +481,11 @@ function acl_lookup(&$a, $out_type = 'json') {
        if ($type=='' || $type=='g'){
 
                $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
-                               FROM `group`,`group_member`
-                               WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d
-                                       AND `group_member`.`gid`=`group`.`id`
+                               FROM `group`
+                               INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid`
+                               WHERE NOT `group`.`deleted` AND `group`.`uid` = %d
                                        $sql_extra
-                               GROUP BY `group`.`id`
+                               GROUP BY `group`.`name`
                                ORDER BY `group`.`name`
                                LIMIT %d,%d",
                        intval(local_user()),
@@ -556,7 +556,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                if($r) {
                        foreach($r as $g) {
                                $contacts[] = array(
-                                       "photo"    => $g['photo'],
+                                       "photo"    => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
                                        "name"     => $g['name'],
                                        "nick"     => (x($g['addr']) ? $g['addr'] : $g['url']),
                                        "network" => $g['network'],
@@ -637,22 +637,35 @@ function acl_lookup(&$a, $out_type = 'json') {
                $tot += count($unknow_contacts);
        }
 
+       $results = array(
+               "tot"   => $tot,
+               "start" => $start,
+               "count" => $count,
+               "groups" => $groups,
+               "contacts" => $contacts,
+               "items" => $items,
+               "type"  => $type,
+               "search" => $search,
+       );
+
+       call_hooks('acl_lookup_end', $results);
+
        if($out_type === 'html') {
                $o = array(
-                       'tot'           => $tot,
-                       'start' => $start,
-                       'count' => $count,
-                       'groups'        => $groups,
-                       'contacts'      => $contacts,
+                       'tot'           => $results["tot"],
+                       'start'         => $results["start"],
+                       'count'         => $results["count"],
+                       'groups'        => $results["groups"],
+                       'contacts'      => $results["contacts"],
                );
                return $o;
        }
 
        $o = array(
-               'tot'   => $tot,
-               'start' => $start,
-               'count' => $count,
-               'items' => $items,
+               'tot'   => $results["tot"],
+               'start' => $results["start"],
+               'count' => $results["count"],
+               'items' => $results["items"],
        );
 
        echo json_encode($o);
@@ -677,7 +690,7 @@ function navbar_complete(&$a) {
        $localsearch = get_config('system','poco_local_search');
 
        $search = $prefix.notags(trim($_REQUEST['search']));
-       $mode = $_REQUEST['mode'];
+       $mode = $_REQUEST['smode'];
 
        // don't search if search term has less than 2 characters
        if(! $search || mb_strlen($search) < 2)