Merge pull request #970 from annando/master

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index ee74ccc16ab440309f1fe9ac8e24ebee026dd023..0a9b2c90aeeb6ab522d8fc5ba6db32b78ca39eb9 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -382,7 +382,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']:"");
-       
+       $conv_id = (x($_REQUEST,'conversation')?$_REQUEST['conversation']:null);
 
        // For use with jquery.autocomplete for private mail completion
 
@@ -450,6 +450,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                $contact_count = 0;
        }
        
+       
        $tot = $group_count+$contact_count;
        
        $groups = array();
@@ -553,6 +554,52 @@ function acl_lookup(&$a, $out_type = 'json') {
                
        $items = array_merge($groups, $contacts);
 
+       if ($conv_id) {
+               /* if $conv_id is set, get unknow contacts in thread */ 
+               /* but first get know contacts url to filter them out */
+               function _contact_link($i){ return dbesc($i['link']); }
+               $known_contacts = array_map(_contact_link, $contacts);
+               $unknow_contacts=array();
+               $r = q("select 
+                                       `author-avatar`,`author-name`,`author-link`
+                               from item where parent=%d
+                               and (
+                                       `author-name` LIKE '%%%s%%' OR
+                                       `author-link` LIKE '%%%s%%'
+                               ) and 
+                               `author-link` NOT IN ('%s')
+                               GROUP BY `author-link`
+                               ORDER BY `author-name` ASC
+                               ", 
+                               intval($conv_id),
+                               dbesc($search),
+                               dbesc($search),
+                               implode("','", $known_contacts)
+               );
+               if (is_array($r) && count($r)){
+                       foreach($r as $row) {
+                               // nickname..
+                               $up = parse_url($row['author-link']);
+                               $nick = explode("/",$up['path']);
+                               $nick = $nick[count($nick)-1];
+                               $nick .= "@".$up['host'];
+                               // /nickname
+                               $unknow_contacts[] = array(
+                                       "type"  => "c",
+                                       "photo" => $row['author-avatar'],
+                                       "name"  => $row['author-name'],
+                                       "id"    => '',
+                                       "network" => "unknown",
+                                       "link" => $row['author-link'],
+                                       "nick" => $nick,
+                                       "forum" => false
+                               );
+                       }
+               }
+
+               $items = array_merge($items, $unknow_contacts);
+               $tot += count($unknow_contacts);
+       }
 
        if($out_type === 'html') {
                $o = array(