X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FSearch%2FAcl.php;h=11c3eea79fc306a8acd93c5e3d23181a9d46b521;hb=69e4254dcc51345a36e13fb96f94d9b57bc37489;hp=cc8df3eab2262fc660f4de506326144636bb4f7b;hpb=e5a336ff77f76741f8a7580677628cc58bce7478;p=friendica.git diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php index cc8df3eab2..11c3eea79f 100644 --- a/src/Module/Search/Acl.php +++ b/src/Module/Search/Acl.php @@ -1,6 +1,6 @@ t('You must be logged in to use this module.')); - } + parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + + $this->session = $session; + $this->database = $database; + } - $type = $_REQUEST['type'] ?? self::TYPE_MENTION_CONTACT_GROUP; + protected function rawContent(array $request = []) + { + if (!$this->session->getLocalUserId()) { + throw new HTTPException\UnauthorizedException($this->t('You must be logged in to use this module.')); + } + $type = $request['type'] ?? self::TYPE_MENTION_CONTACT_GROUP; if ($type === self::TYPE_GLOBAL_CONTACT) { - $o = self::globalContactSearch(); + $o = $this->globalContactSearch($request); } else { - $o = self::regularContactSearch($type); + $o = $this->regularContactSearch($request, $type); } - echo json_encode($o); - exit; + System::jsonExit($o); } - private static function globalContactSearch() + private function globalContactSearch(array $request): array { // autocomplete for global contact search (e.g. navbar search) - $search = Strings::escapeTags(trim($_REQUEST['search'])); - $mode = $_REQUEST['smode']; - $page = $_REQUEST['page'] ?? 1; + $search = trim($request['search']); + $mode = $request['smode']; + $page = $request['page'] ?? 1; - $r = Search::searchGlobalContact($search, $mode, $page); + $result = Search::searchContact($search, $mode, $page); $contacts = []; - foreach ($r as $g) { - if (empty($g['name'])) { - DI::logger()->warning('Wrong result item from Search::searchGlobalContact', ['$g' => $g, '$search' => $search, '$mode' => $mode, '$page' => $page]); - continue; - } - + foreach ($result as $contact) { $contacts[] = [ - 'photo' => ProxyUtils::proxifyUrl($g['photo'], false, ProxyUtils::SIZE_MICRO), - 'name' => htmlspecialchars($g['name']), - 'nick' => $g['addr'] ?: $g['url'], - 'network' => $g['network'], - 'link' => $g['url'], - 'forum' => !empty($g['community']) ? 1 : 0, + 'photo' => Contact::getMicro($contact, true), + 'name' => htmlspecialchars($contact['name']), + 'nick' => $contact['addr'] ?: $contact['url'], + 'network' => $contact['network'], + 'link' => $contact['url'], + 'forum' => $contact['contact-type'] == Contact::TYPE_COMMUNITY, ]; } - $o = [ + return [ 'start' => ($page - 1) * 20, 'count' => 1000, 'items' => $contacts, ]; - - return $o; } - private static function regularContactSearch(string $type) + private function regularContactSearch(array $request, string $type): array { - $start = $_REQUEST['start'] ?? 0; - $count = $_REQUEST['count'] ?? 100; - $search = $_REQUEST['search'] ?? ''; - $conv_id = $_REQUEST['conversation'] ?? null; + $start = $request['start'] ?? 0; + $count = $request['count'] ?? 100; + $search = $request['search'] ?? ''; + $conv_id = $request['conversation'] ?? null; // For use with jquery.textcomplete for private mail completion - if (!empty($_REQUEST['query'])) { + if (!empty($request['query'])) { if (!$type) { $type = self::TYPE_PRIVATE_MESSAGE; } - $search = $_REQUEST['query']; + $search = $request['query']; } - Logger::info('ACL {action} - {subaction}', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]); + $this->logger->info('ACL {action} - {subaction} - start', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]); - $sql_extra = ''; - $sql_extra2 = ''; + $sql_extra = ''; + $condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", $this->session->getLocalUserId()]; + $condition_group = ["`uid` = ? AND NOT `deleted`", $this->session->getLocalUserId()]; if ($search != '') { - $sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'"; - $sql_extra2 = "AND (`attag` LIKE '%%" . DBA::escape($search) . "%%' OR `name` LIKE '%%" . DBA::escape($search) . "%%' OR `nick` LIKE '%%" . DBA::escape($search) . "%%')"; + $sql_extra = "AND `name` LIKE '%%" . $this->database->escape($search) . "%%'"; + $condition = DBA::mergeConditions($condition, ["(`attag` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", + '%' . $search . '%', '%' . $search . '%', '%' . $search . '%']); + $condition_group = DBA::mergeConditions($condition_group, ["`name` LIKE ?", '%' . $search . '%']); } // count groups and contacts $group_count = 0; if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) { - $r = q("SELECT COUNT(*) AS g FROM `group` WHERE NOT `deleted` AND `uid` = %d $sql_extra", - intval(local_user()) - ); - $group_count = (int) $r[0]['g']; + $group_count = $this->database->count('group', $condition_group); } - $sql_extra2 .= ' ' . Widget::unavailableNetworks(); + $networks = Widget::unavailableNetworks(); + $condition = DBA::mergeConditions($condition, array_merge(["NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")"], $networks)); - $contact_count = 0; switch ($type) { case self::TYPE_MENTION_CONTACT_GROUP: + $condition = DBA::mergeConditions($condition, + ["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::OSTATUS + ]); + break; + case self::TYPE_MENTION_CONTACT: - // autocomplete for editor mentions - $r = q("SELECT COUNT(*) AS c FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `deleted` - AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `notify` != '' $sql_extra2", - intval(local_user()) - ); - $contact_count = (int) $r[0]['c']; + $condition = DBA::mergeConditions($condition, + ["NOT `self` AND NOT `blocked` AND `notify` != ?", '' + ]); break; case self::TYPE_MENTION_FORUM: - // autocomplete for editor mentions of forums - $r = q("SELECT COUNT(*) AS c FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `deleted` - AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND (`forum` OR `prv`) - AND `notify` != '' $sql_extra2", - intval(local_user()) - ); - $contact_count = (int) $r[0]['c']; + $condition = DBA::mergeConditions($condition, + ["NOT `self` AND NOT `blocked` AND `notify` != ? AND `contact-type` = ?", '', Contact::TYPE_COMMUNITY + ]); break; case self::TYPE_PRIVATE_MESSAGE: - // autocomplete for Private Messages - $r = q("SELECT COUNT(*) AS c FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `deleted` - AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `network` IN ('%s', '%s', '%s') $sql_extra2", - intval(local_user()), - DBA::escape(Protocol::ACTIVITYPUB), - DBA::escape(Protocol::DFRN), - DBA::escape(Protocol::DIASPORA) - ); - $contact_count = (int) $r[0]['c']; - break; - - case self::TYPE_ANY_CONTACT: - default: - // autocomplete for Contacts - $r = q("SELECT COUNT(*) AS c FROM `contact` - WHERE `uid` = %d AND NOT `self` - AND NOT `pending` AND NOT `deleted` $sql_extra2", - intval(local_user()) - ); - $contact_count = (int) $r[0]['c']; + $condition = DBA::mergeConditions($condition, + ["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` IN (?, ?, ?)", '', Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA + ]); break; } - $tot = $group_count + $contact_count; + $contact_count = $this->database->count('contact', $condition); - $groups = []; - $contacts = []; + $resultTotal = $group_count + $contact_count; + + $resultGroups = []; + $resultContacts = []; if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) { /// @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 + $groups = $this->database->toArray($this->database->p("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` - WHERE NOT `group`.`deleted` AND `group`.`uid` = %d + WHERE NOT `group`.`deleted` AND `group`.`uid` = ? $sql_extra GROUP BY `group`.`name`, `group`.`id` ORDER BY `group`.`name` - LIMIT %d, %d", - intval(local_user()), - intval($start), - intval($count) - ); - - foreach ($r as $g) { - $groups[] = [ + LIMIT ?, ?", + $this->session->getLocalUserId(), + $start, + $count + )); + + foreach ($groups as $group) { + $resultGroups[] = [ 'type' => 'g', 'photo' => 'images/twopeople.png', - 'name' => htmlspecialchars($g['name']), - 'id' => intval($g['id']), - 'uids' => array_map('intval', explode(',', $g['uids'])), + 'name' => htmlspecialchars($group['name']), + 'id' => intval($group['id']), + 'uids' => array_map('intval', explode(',', $group['uids'])), 'link' => '', 'forum' => '0' ]; } - if ((count($groups) > 0) && ($search == '')) { - $groups[] = ['separator' => true]; + if ((count($resultGroups) > 0) && ($search == '')) { + $resultGroups[] = ['separator' => true]; } } - $r = []; - switch ($type) { - case self::TYPE_MENTION_CONTACT_GROUP: - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv`, (`prv` OR `forum`) AS `frm` FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' - AND NOT (`network` IN ('%s', '%s')) - $sql_extra2 - ORDER BY `name`", - intval(local_user()), - DBA::escape(Protocol::OSTATUS), - DBA::escape(Protocol::STATUSNET) - ); - break; - - case self::TYPE_MENTION_CONTACT: - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' - AND NOT (`network` IN ('%s')) - $sql_extra2 - ORDER BY `name`", - intval(local_user()), - DBA::escape(Protocol::STATUSNET) - ); - break; - - case self::TYPE_MENTION_FORUM: - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' - AND NOT (`network` IN ('%s')) - AND (`forum` OR `prv`) - $sql_extra2 - ORDER BY `name`", - intval(local_user()), - DBA::escape(Protocol::STATUSNET) - ); - break; - - case self::TYPE_PRIVATE_MESSAGE: - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact` - WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `network` IN ('%s', '%s', '%s') - $sql_extra2 - ORDER BY `name`", - intval(local_user()), - DBA::escape(Protocol::ACTIVITYPUB), - DBA::escape(Protocol::DFRN), - DBA::escape(Protocol::DIASPORA) - ); - break; - - case self::TYPE_ANY_CONTACT: - default: - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` - WHERE `uid` = %d AND NOT `deleted` AND NOT `pending` AND NOT `archive` - $sql_extra2 - ORDER BY `name`", - intval(local_user()) - ); - break; + $contacts = []; + if ($type != self::TYPE_MENTION_GROUP) { + $contacts = Contact::selectToArray([], $condition, ['order' => ['name']]); } - if (DBA::isResult($r)) { - $forums = []; - foreach ($r as $g) { - $entry = [ - 'type' => 'c', - 'photo' => ProxyUtils::proxifyUrl($g['micro'], false, ProxyUtils::SIZE_MICRO), - 'name' => htmlspecialchars($g['name']), - 'id' => intval($g['id']), - 'network' => $g['network'], - 'link' => $g['url'], - 'nick' => htmlentities(($g['attag'] ?? '') ?: $g['nick']), - 'addr' => htmlentities(($g['addr'] ?? '') ?: $g['url']), - 'forum' => !empty($g['forum']) || !empty($g['prv']) ? 1 : 0, - ]; - if ($entry['forum']) { - $forums[] = $entry; - } else { - $contacts[] = $entry; - } + $forums = []; + foreach ($contacts as $contact) { + $entry = [ + 'type' => 'c', + 'photo' => Contact::getMicro($contact, true), + 'name' => htmlspecialchars($contact['name']), + 'id' => intval($contact['id']), + 'network' => $contact['network'], + 'link' => $contact['url'], + 'nick' => htmlentities(($contact['attag'] ?? '') ?: $contact['nick']), + 'addr' => htmlentities(($contact['addr'] ?? '') ?: $contact['url']), + 'forum' => $contact['contact-type'] == Contact::TYPE_COMMUNITY, + ]; + if ($entry['forum']) { + $forums[] = $entry; + } else { + $resultContacts[] = $entry; } - if (count($forums) > 0) { - if ($search == '') { - $forums[] = ['separator' => true]; - } - $contacts = array_merge($forums, $contacts); + } + + if ($forums) { + if ($search == '') { + $forums[] = ['separator' => true]; } + + $resultContacts = array_merge($forums, $resultContacts); } - $items = array_merge($groups, $contacts); + $resultItems = array_merge($resultGroups, $resultContacts); if ($conv_id) { - // In multi threaded posts the conv_id is not the parent of the whole thread - $parent_item = Item::selectFirst(['parent'], ['id' => $conv_id]); - if (DBA::isResult($parent_item)) { + // In multithreaded posts the conv_id is not the parent of the whole thread + $parent_item = Post::selectFirst(['parent'], ['id' => $conv_id]); + if ($parent_item) { $conv_id = $parent_item['parent']; } @@ -330,34 +259,28 @@ class Acl extends BaseModule * 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 $i['link']; - }, $contacts); + $known_contacts = array_column($resultContacts, 'link'); $unknown_contacts = []; - $condition = ["`parent` = ?", $conv_id]; - $params = ['order' => ['author-name' => true]]; - $authors = Item::selectForUser(local_user(), ['author-link'], $condition, $params); + $condition = ["`parent` = ?", $conv_id]; + $params = ['order' => ['author-name' => true]]; + $authors = Post::selectForUser($this->session->getLocalUserId(), ['author-link'], $condition, $params); $item_authors = []; - while ($author = Item::fetch($authors)) { + while ($author = Post::fetch($authors)) { $item_authors[$author['author-link']] = $author['author-link']; } - DBA::close($authors); - - foreach ($item_authors as $author) { - if (in_array($author, $known_contacts)) { - continue; - } - $contact = Contact::getDetailsByURL($author); + $this->database->close($authors); - if (count($contact) > 0) { + foreach (array_diff($item_authors, $known_contacts) as $author) { + $contact = Contact::getByURL($author, false, ['micro', 'name', 'id', 'network', 'nick', 'addr', 'url', 'forum', 'avatar']); + if ($contact) { $unknown_contacts[] = [ 'type' => 'c', - 'photo' => ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO), + 'photo' => Contact::getMicro($contact, true), 'name' => htmlspecialchars($contact['name']), - 'id' => intval($contact['cid']), + 'id' => intval($contact['id']), 'network' => $contact['network'], 'link' => $contact['url'], 'nick' => htmlentities(($contact['nick'] ?? '') ?: $contact['addr']), @@ -367,17 +290,17 @@ class Acl extends BaseModule } } - $items = array_merge($items, $unknown_contacts); - $tot += count($unknown_contacts); + $resultItems = array_merge($resultItems, $unknown_contacts); + $resultTotal += count($unknown_contacts); } $results = [ - 'tot' => $tot, + 'tot' => $resultTotal, 'start' => $start, 'count' => $count, - 'groups' => $groups, - 'contacts' => $contacts, - 'items' => $items, + 'groups' => $resultGroups, + 'contacts' => $resultContacts, + 'items' => $resultItems, 'type' => $type, 'search' => $search, ]; @@ -391,6 +314,7 @@ class Acl extends BaseModule 'items' => $results['items'], ]; + $this->logger->info('ACL {action} - {subaction} - done', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]); return $o; } }