X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseSearch.php;h=cc8fab8f7e5619511ad55b9f41f39dbade71e9aa;hb=c81a9d1ddd7e5b7fff6a173a159ae78ee7fc7698;hp=ca940ae4ead916fd0258aa8026e0f98dcf0467da;hpb=01640a7045e146759bc936dd499ac27738b78940;p=friendica.git

diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index ca940ae4ea..cc8fab8f7e 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,6 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
@@ -31,7 +30,7 @@ use Friendica\Model;
 use Friendica\Network\HTTPException;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
-use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Network;
 
 /**
  * Base class for search modules
@@ -48,9 +47,8 @@ class BaseSearch extends BaseModule
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function performContactSearch($search, $prefix = '')
+	public static function performContactSearch(string $search, string $prefix = ''): string
 	{
-		$a      = DI::app();
 		$config = DI::config();
 
 		$type = Search::TYPE_ALL;
@@ -66,28 +64,37 @@ class BaseSearch extends BaseModule
 		$header = '';
 
 		if (strpos($search, '@') === 0) {
-			$search  = substr($search, 1);
+			$search  = trim(substr($search, 1));
 			$type    = Search::TYPE_PEOPLE;
 			$header  = DI::l10n()->t('People Search - %s', $search);
 
 			if (strrpos($search, '@') > 0) {
-				$results = Search::getContactsFromProbe($search);
+				$results = Search::getContactsFromProbe(Network::convertToIdn($search));
 			}
 		}
 
 		if (strpos($search, '!') === 0) {
-			$search = substr($search, 1);
+			$search = trim(substr($search, 1));
 			$type   = Search::TYPE_FORUM;
 			$header = DI::l10n()->t('Forum Search - %s', $search);
 		}
 
-		$args = DI::args();
-		$pager = new Pager($args->getQueryString());
+		$search = Network::convertToIdn($search);
+
+		if (DI::mode()->isMobile()) {
+			$itemsPerPage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network',
+				DI::config()->get('system', 'itemspage_network_mobile'));
+		} else {
+			$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 (strlen($config->get('system', 'directory')) && empty($results)) {
+		} elseif (Search::getGlobalDirectory() && empty($results)) {
 			$results = Search::getContactsFromGlobalDirectory($search, $type, $pager->getPage());
 			$pager->setItemsPerPage($results->getItemsPage());
 		}
@@ -106,76 +113,26 @@ class BaseSearch extends BaseModule
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	protected static function printResult(ResultList $results, Pager $pager, $header = '')
+	protected static function printResult(ResultList $results, Pager $pager, string $header = ''): string
 	{
 		if ($results->getTotal() == 0) {
-			info(DI::l10n()->t('No matches'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('No matches'));
 			return '';
 		}
 
-		$id      = 0;
 		$entries = [];
 		foreach ($results->getResults() as $result) {
 
 			// in case the result is a contact result, add a contact-specific entry
 			if ($result instanceof ContactResult) {
-
-				$alt_text    = '';
-				$location    = '';
-				$about       = '';
-				$accountType = '';
-				$photo_menu  = [];
-
-				// If We already know this contact then don't show the "connect" button
-				if ($result->getCid() > 0 || $result->getPCid() > 0) {
-					$connLink = "";
-					$connTxt  = "";
-					$contact  = Model\Contact::getById(
-						($result->getCid() > 0) ? $result->getCid() : $result->getPCid()
-					);
-
-					if (!empty($contact)) {
-						$photo_menu  = Model\Contact::photoMenu($contact);
-						$details     = Contact::getContactTemplateVars($contact);
-						$alt_text    = $details['alt_text'];
-						$location    = $contact['location'];
-						$about       = $contact['about'];
-						$accountType = Model\Contact::getAccountType($contact);
-					} else {
-						$photo_menu = [];
-					}
-				} else {
-					$connLink = DI::baseUrl()->get() . '/follow/?url=' . $result->getUrl();
-					$connTxt  = DI::l10n()->t('Connect');
-
-					$photo_menu['profile'] = [DI::l10n()->t("View Profile"), Model\Contact::magicLink($result->getUrl())];
-					$photo_menu['follow']  = [DI::l10n()->t("Connect/Follow"), $connLink];
+				$contact = Model\Contact::getByURLForUser($result->getUrl(), DI::userSession()->getLocalUserId());
+				if (!empty($contact)) {
+					$entries[] = Contact::getContactTemplateVars($contact);
 				}
-
-				$photo = str_replace("http:///photo/", Search::getGlobalDirectory() . "/photo/", $result->getPhoto());
-
-				$entry     = [
-					'alt_text'     => $alt_text,
-					'url'          => Model\Contact::magicLink($result->getUrl()),
-					'itemurl'      => $result->getItem(),
-					'name'         => $result->getName(),
-					'thumb'        => ProxyUtils::proxifyUrl($photo, false, ProxyUtils::SIZE_THUMB),
-					'img_hover'    => $result->getTags(),
-					'conntxt'      => $connTxt,
-					'connlnk'      => $connLink,
-					'photo_menu'   => $photo_menu,
-					'details'      => $location,
-					'tags'         => $result->getTags(),
-					'about'        => $about,
-					'account_type' => $accountType,
-					'network'      => ContactSelector::networkToName($result->getNetwork(), $result->getUrl()),
-					'id'           => ++$id,
-				];
-				$entries[] = $entry;
 			}
 		}
 
-		$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+		$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
 		return Renderer::replaceMacros($tpl, [
 			'title'     => $header,
 			'$contacts' => $entries,