X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseSearch.php;h=262ec94a20b8d875f751c15ad0d8ee2ba83c0ff5;hb=649bbaa4c3d28cdf4cb8544ff2f92ba493023953;hp=3aae68f7b23f63f004c7c4df5e4710520117b745;hpb=b36d4eb0dd4bdc25a468c95c749bfae1b6324be9;p=friendica.git

diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index 3aae68f7b2..262ec94a20 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,9 +23,9 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content\Pager;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
-use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Model;
 use Friendica\Network\HTTPException;
@@ -63,18 +63,13 @@ class BaseSearch extends BaseModule
 		}
 
 		$header = '';
+		$results = new ResultList();
 
 		if (strpos($search, '@') === 0) {
 			$search  = trim(substr($search, 1));
 			$type    = Search::TYPE_PEOPLE;
 			$header  = DI::l10n()->t('People Search - %s', $search);
-
-			if (strrpos($search, '@') > 0) {
-				$results = Search::getContactsFromProbe(Network::convertToIdn($search));
-			}
-		}
-
-		if (strpos($search, '!') === 0) {
+		} elseif (strpos($search, '!') === 0) {
 			$search = trim(substr($search, 1));
 			$type   = Search::TYPE_FORUM;
 			$header = DI::l10n()->t('Forum Search - %s', $search);
@@ -83,23 +78,29 @@ class BaseSearch extends BaseModule
 		$search = Network::convertToIdn($search);
 
 		if (DI::mode()->isMobile()) {
-			$itemsPerPage = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_mobile_network',
+			$itemsPerPage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network',
 				DI::config()->get('system', 'itemspage_network_mobile'));
 		} else {
-			$itemsPerPage = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_network',
+			$itemsPerPage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_network',
 				DI::config()->get('system', 'itemspage_network'));
 		}
 
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
-		if ($localSearch && empty($results)) {
-			$pager->setItemsPerPage(80);
-			$results = Search::getContactsFromLocalDirectory($search, $type, $pager->getStart(), $pager->getItemsPerPage());
-		} elseif (Search::getGlobalDirectory() && empty($results)) {
+		if (!$results->getTotal() && !$localSearch && Search::getGlobalDirectory()) {
 			$results = Search::getContactsFromGlobalDirectory($search, $type, $pager->getPage());
 			$pager->setItemsPerPage($results->getItemsPage());
 		}
 
+		if (!$results->getTotal()) {
+			$pager->setItemsPerPage(80);
+			$results = Search::getContactsFromLocalDirectory($search, $type, $pager->getStart(), $pager->getItemsPerPage());
+		}
+
+		if (!$results->getTotal()) {
+			$results = Search::getContactsFromProbe(Network::convertToIdn($search), $type == Search::TYPE_FORUM);
+		}
+
 		return self::printResult($results, $pager, $header);
 	}
 
@@ -121,23 +122,33 @@ 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) {
-				$contact = Model\Contact::getByURLForUser($result->getUrl(), Session::getLocalUser());
+				if (Network::isUriBlocked($result->getUrl())) {
+					$filtered++;
+					continue;
+				}
+
+				$contact = Model\Contact::getByURLForUser($result->getUrl(), DI::userSession()->getLocalUserId());
 				if (!empty($contact)) {
 					$entries[] = Contact::getContactTemplateVars($contact);
 				}
 			}
 		}
 
-		$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+		$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 <a href="/friendica">About page</a>.',
+				'%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 <a href="/friendica">About page</a>.',
+				$filtered) : '',
 			'$contacts' => $entries,
 			'$paginate' => $pager->renderFull($results->getTotal()),
 		]);
 	}
-}
+}
\ No newline at end of file