]> git.mxchange.org Git - friendica.git/blobdiff - include/acl_selectors.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #3343 from annando/1704-mastodon
[friendica.git] / include / acl_selectors.php
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index f6c4f947edc4ff5e724fbda2d38da9beb6a7b09c..f2d2999ba6175341ef254b4754e29f0f4b9c0083 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -135,7 +135,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
                $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
 
        $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
-               WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
+               WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
                $sql_extra
                ORDER BY `name` ASC ",
                intval(local_user())
@@ -210,7 +210,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" $tabindex >\r\n";
 
        $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
-               WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
+               WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
                $sql_extra
                ORDER BY `name` ASC ",
                intval(local_user())
@@ -372,7 +372,7 @@ function populate_acl($user = null, $show_jotnets = false) {
 
 }
 
-function construct_acl_data(&$a, $user) {
+function construct_acl_data(App $a, $user) {
 
        // Get group and contact information for html ACL selector
        $acl_data = acl_lookup($a, 'html');
@@ -404,7 +404,7 @@ function construct_acl_data(&$a, $user) {
 
 }
 
-function acl_lookup(&$a, $out_type = 'json') {
+function acl_lookup(App $a, $out_type = 'json') {
 
        if (!local_user()) {
                return '';
@@ -449,8 +449,8 @@ function acl_lookup(&$a, $out_type = 'json') {
        // autocomplete for editor mentions
        if ($type=='' || $type=='c'){
                $r = q("SELECT COUNT(*) AS c FROM `contact`
-                               WHERE `uid` = %d AND `self` = 0
-                               AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
+                               WHERE `uid` = %d AND NOT `self`
+                               AND NOT `blocked` AND NOT `pending` AND NOT `archive`
                                AND `notify` != '' $sql_extra2" ,
                        intval(local_user())
                );
@@ -461,8 +461,8 @@ function acl_lookup(&$a, $out_type = 'json') {
                // autocomplete for Private Messages
 
                $r = q("SELECT COUNT(*) AS c FROM `contact`
-                               WHERE `uid` = %d AND `self` = 0
-                               AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
+                               WHERE `uid` = %d AND NOT `self`
+                               AND NOT `blocked` AND NOT `pending` AND NOT `archive`
                                AND `network` IN ('%s','%s','%s') $sql_extra2" ,
                        intval(local_user()),
                        dbesc(NETWORK_DFRN),
@@ -477,8 +477,8 @@ function acl_lookup(&$a, $out_type = 'json') {
                // autocomplete for Contacts
 
                $r = q("SELECT COUNT(*) AS c FROM `contact`
-                               WHERE `uid` = %d AND `self` = 0
-                               AND `pending` = 0 $sql_extra2" ,
+                               WHERE `uid` = %d AND NOT `self`
+                               AND NOT `pending` $sql_extra2" ,
                        intval(local_user())
                );
                $contact_count = (int)$r[0]['c'];
@@ -495,12 +495,14 @@ function acl_lookup(&$a, $out_type = 'json') {
 
        if ($type=='' || $type=='g'){
 
+               /// @todo We should cache this query.
+               // This can be done when we can delete cache entries via wildcard
                $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
                                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`.`name`
+                               GROUP BY `group`.`name`, `group`.`id`
                                ORDER BY `group`.`name`
                                LIMIT %d,%d",
                        intval(local_user()),
@@ -525,7 +527,7 @@ function acl_lookup(&$a, $out_type = 'json') {
        if ($type==''){
 
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
-                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
+                       WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
                        AND NOT (`network` IN ('%s', '%s'))
                        $sql_extra2
                        ORDER BY `name` ASC ",
@@ -536,7 +538,7 @@ function acl_lookup(&$a, $out_type = 'json') {
        elseif ($type=='c'){
 
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
-                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
+                       WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
                        AND NOT (`network` IN ('%s'))
                        $sql_extra2
                        ORDER BY `name` ASC ",
@@ -546,7 +548,7 @@ function acl_lookup(&$a, $out_type = 'json') {
        }
        elseif($type == 'm') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
-                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
+                       WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive`
                        AND `network` IN ('%s','%s','%s')
                        $sql_extra2
                        ORDER BY `name` ASC ",
@@ -608,46 +610,50 @@ 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`
+               /*
+                * if $conv_id is set, get unknown contacts in thread
+                * but first get known contacts url to filter them out
+                */
+               $known_contacts = array_map(
+                       function ($i) {
+                               return dbesc($i['link']);
+                       }
+               , $contacts);
+
+               $unknown_contacts = array();
+               $r = q("SELECT `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`
+                               GROUP BY `author-link`, `author-avatar`, `author-name`
                                ORDER BY `author-name` ASC
                                ",
                                intval($conv_id),
                                dbesc($search),
                                dbesc($search),
-                               implode("','", $known_contacts)
+                               implode("', '", $known_contacts)
                );
-               if (dbm::is_result($r)){
+               if (dbm::is_result($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'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
-                                       'name'    => htmlentities($row['author-name']),
-                                       'id'      => '',
-                                       'network' => 'unknown',
-                                       'link'    => $row['author-link'],
-                                       'nick'    => htmlentities($nick),
-                                       'forum'   => false
-                               );
+                               $contact = get_contact_details_by_url($row['author-link']);
+
+                               if (count($contact) > 0) {
+                                       $unknown_contacts[] = array(
+                                               'type'    => 'c',
+                                               'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
+                                               'name'    => htmlentities($contact['name']),
+                                               'id'      => intval($contact['cid']),
+                                               'network' => $contact['network'],
+                                               'link'    => $contact['url'],
+                                               'nick'    => htmlentities($contact['nick'] ? : $contact['addr']),
+                                               'forum'   => $contact['forum']
+                                       );
+                               }
                        }
                }
 
-               $items = array_merge($items, $unknow_contacts);
-               $tot += count($unknow_contacts);
+               $items = array_merge($items, $unknown_contacts);
+               $tot += count($unknown_contacts);
        }
 
        $results = array(
@@ -687,11 +693,11 @@ function acl_lookup(&$a, $out_type = 'json') {
 }
 /**
  * @brief Searching for global contacts for autocompletion
- * 
+ *
  * @param App $a
  * @return array with the search results
  */
-function navbar_complete(App &$a) {
+function navbar_complete(App $a) {
 
 //     logger('navbar_complete');
 
Unnamed repository; edit this file 'description' to name the repository.