Merge branch 'develop' into rewrites/coding-convention-split2-1-2

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index f4a1ede7f9b804b57fa05a96329ccf5ccd9d7535..421868ea16187942753c7f821f457b47eaefcc12 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -55,7 +55,8 @@ 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) {
 
        $a = get_app();
@@ -84,7 +85,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
                }
 
                if (x($options, 'networks')) {
-                       switch($options['networks']) {
+                       switch ($options['networks']) {
                                case 'DFRN_ONLY':
                                        $networks = array(NETWORK_DFRN);
                                        break;
@@ -375,7 +376,7 @@ function populate_acl($user = null, $show_jotnets = false) {
                '$aclModalTitle' => t('Permissions'),
                '$aclModalDismiss' => t('Close'),
                '$features' => array(
-               'aclautomention' => (feature_enabled($user['uid'],"aclautomention")?"true":"false")
+               'aclautomention' => (feature_enabled($user['uid'], "aclautomention") ? "true" : "false")
                ),
        ));
 
@@ -392,7 +393,7 @@ function construct_acl_data(App $a, $user) {
        $user_defaults = get_acl_permissions($user);
 
        if ($acl_data['groups']) {
-               foreach ($acl_data['groups'] as $key=>$group) {
+               foreach ($acl_data['groups'] as $key => $group) {
                        // Add a "selected" flag to groups that are posted to by default
                        if ($user_defaults['allow_gid'] &&
                                        in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) {
@@ -403,7 +404,7 @@ function construct_acl_data(App $a, $user) {
                }
        }
        if ($acl_data['contacts']) {
-               foreach ($acl_data['contacts'] as $key=>$contact) {
+               foreach ($acl_data['contacts'] as $key => $contact) {
                        // Add a "selected" flag to groups that are posted to by default
                        if ($user_defaults['allow_cid'] &&
                                        in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) {
@@ -442,7 +443,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 
        logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
 
-       if ($search!="") {
+       if ($search != "") {
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
                $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
        } else {
@@ -624,12 +625,18 @@ function acl_lookup(App $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')
@@ -639,31 +646,29 @@ function acl_lookup(App $a, $out_type = 'json') {
                                intval($conv_id),
                                dbesc($search),
                                dbesc($search),
-                               implode("','", $known_contacts)
+                               implode("', '", $known_contacts)
                );
                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(