X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseSearch.php;h=675deb8fb26abf935d43f3d51ad4ce12277bab62;hb=d2429b109601ab875f0ed0802b349edee07fba06;hp=cc8fab8f7e5619511ad55b9f41f39dbade71e9aa;hpb=360614d2cf3aceeb763ef1281ad5236878f5d735;p=friendica.git
diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index cc8fab8f7e..675deb8fb2 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -97,6 +97,8 @@ class BaseSearch extends BaseModule
} elseif (Search::getGlobalDirectory() && empty($results)) {
$results = Search::getContactsFromGlobalDirectory($search, $type, $pager->getPage());
$pager->setItemsPerPage($results->getItemsPage());
+ } else {
+ $results = new ResultList();
}
return self::printResult($results, $pager, $header);
@@ -120,11 +122,17 @@ class BaseSearch extends BaseModule
return '';
}
+ $filtered = 0;
+
$entries = [];
foreach ($results->getResults() as $result) {
-
// in case the result is a contact result, add a contact-specific entry
if ($result instanceof ContactResult) {
+ if (Network::isUriBlocked($result->getUrl())) {
+ $filtered++;
+ continue;
+ }
+
$contact = Model\Contact::getByURLForUser($result->getUrl(), DI::userSession()->getLocalUserId());
if (!empty($contact)) {
$entries[] = Contact::getContactTemplateVars($contact);
@@ -134,7 +142,11 @@ class BaseSearch extends BaseModule
$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
return Renderer::replaceMacros($tpl, [
- 'title' => $header,
+ '$title' => $header,
+ '$filtered' => $filtered ? DI::l10n()->tt(
+ '%d result was filtered out because your node blocks the domain it is registered on. You can review the list of domains your node is currently blocking in the About page.',
+ '%d results were filtered out because your node blocks the domain they are registered on. You can review the list of domains your node is currently blocking in the About page.',
+ $filtered) : '',
'$contacts' => $entries,
'$paginate' => $pager->renderFull($results->getTotal()),
]);