reverted change (which duplicated above query), thanks to @annano to point this out...

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4a35fd0f088070aa13d575047fd1fff1ad5c180c..ed9c634c23a8073950eb6ae40e146444e8554737 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -33,7 +33,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
        call_hooks($a->module . '_pre_' . $selname, $arr);
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
                                $selected = " selected=\"selected\" ";
@@ -144,7 +144,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
        call_hooks($a->module . '_pre_' . $selname, $arr);
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
                                $selected = " selected=\"selected\" ";
@@ -220,7 +220,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
        $receiverlist = array();
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
                                $selected = " selected=\"selected\" ";
@@ -314,7 +314,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(count($r)) {
+                       if (dbm::is_result($r)) {
                                $mail_enabled = true;
                                if(intval($r[0]['pubmail']))
                                        $pubmail_enabled = true;
@@ -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'],
@@ -577,7 +577,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                $r = array();
 
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $g){
                        $contacts[] = array(
                                "type"  => "c",
@@ -612,7 +612,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                                dbesc($search),
                                implode("','", $known_contacts)
                );
-               if (is_array($r) && count($r)){
+               if (dbm::is_result($r)){
                        foreach($r as $row) {
                                // nickname..
                                $up = parse_url($row['author-link']);
@@ -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);
@@ -663,7 +676,7 @@ function acl_lookup(&$a, $out_type = 'json') {
  * @brief Searching for global contacts for autocompletion
  * 
  * @param App $a
- * @return array
+ * @return array with the search results
  */
 function navbar_complete(&$a) {
 
@@ -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)
@@ -704,4 +717,4 @@ function navbar_complete(&$a) {
                }
        }
        return;
-}
\ No newline at end of file
+}