X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=0ec753466267a738fd626ba922abecafec02332b;hb=3fc5c1ad840f98926319478a855dab3686a0ace3;hp=74f83a6cc9494b76ce1fac8b7d902f400e9a5aae;hpb=aa9ceabdd9eeec82393e4d5f09aad09c181af33d;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 74f83a6cc9..0ec7534662 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,85 +1,130 @@
 <?php
-include_once('include/text.php');
-require_once('include/socgraph.php');
-require_once('include/contact_widgets.php');
-
-function match_content(&$a) {
-
+/**
+ * @file mod/match.php
+ */
+
+use Friendica\App;
+use Friendica\Content\Pager;
+use Friendica\Content\Widget;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
+
+require_once 'include/text.php';
+
+/**
+ * @brief Controller for /match.
+ *
+ * It takes keywords from your profile and queries the directory server for
+ * matching keywords from other profiles.
+ *
+ * @param App $a App
+ *
+ * @return void|string
+ */
+function match_content(App $a)
+{
 	$o = '';
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
-	$a->page['aside'] .= follow_widget();
-	$a->page['aside'] .= findpeople_widget();
-
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+	$a->page['aside'] .= Widget::findPeople();
+	$a->page['aside'] .= Widget::follow();
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-		'$title' => t('Profile Match')
-	));
+	$_SESSION['return_path'] = $a->cmd;
 
-	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
+	$r = q(
+		"SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
-	if(! count($r))
+	if (! DBA::isResult($r)) {
 		return;
-	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
-		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
+	}
+	if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
+		notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL);
 		return;
-
 	}
 
-	$params = array();
+	$params = [];
 	$tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
 
-	if($tags) {
-		$params['s'] = $tags;
-		if($a->pager['page'] != 1)
-			$params['p'] = $a->pager['page'];
-
-		if(strlen(get_config('system','directory')))
-			$x = post_url(get_server().'/msearch', $params);
-		else
-			$x = post_url($a->get_baseurl() . '/msearch', $params);
+	if ($tags) {
+		$pager = new Pager($a->query_string);
 
-		$j = json_decode($x);
+		$params['s'] = $tags;
+		if ($pager->getPage() != 1) {
+			$params['p'] = $pager->getPage();
+		}
 
-		if($j->total) {
-			$a->set_pager_total($j->total);
-			$a->set_pager_itemspage($j->items_page);
+		if (strlen(Config::get('system', 'directory'))) {
+			$x = Network::post(get_server().'/msearch', $params)->getBody();
+		} else {
+			$x = Network::post(System::baseUrl() . '/msearch', $params)->getBody();
 		}
 
-		if(count($j->results)) {
+		$j = json_decode($x);
 
+		if (count($j->results)) {
+			$pager->setItemsPerPage($j->items_page);
 
+			$id = 0;
 
-			$tpl = get_markup_template('match.tpl');
-			foreach($j->results as $jj) {
-				$match_nurl = normalise_link($jj->url);
-				$match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
+			foreach ($j->results as $jj) {
+				$match_nurl = Strings::normaliseLink($jj->url);
+				$match = q(
+					"SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
 					intval(local_user()),
-					dbesc($match_nurl));
+					DBA::escape($match_nurl)
+				);
+
 				if (!count($match)) {
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
-					$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
-					$o .= replace_macros($tpl,array(
-						'$url' => zrl($jj->url),
-						'$name' => $jj->name,
-						'$photo' => proxy_url($jj->photo),
-						'$inttxt' => ' ' . t('is interested in:'),
-						'$conntxt' => t('Connect'),
-						'$connlnk' => $connlnk,
-						'$tags' => $jj->tags
-					));
+					$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
+					$photo_menu = [
+						'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
+						'follow' => [L10n::t("Connect/Follow"), $connlnk]
+					];
+
+					$contact_details = Contact::getDetailsByURL($jj->url, local_user());
+
+					$entry = [
+						'url' => Contact::magicLink($jj->url),
+						'itemurl' => defaults($contact_details, 'addr', $jj->url),
+						'name' => $jj->name,
+						'details'       => defaults($contact_details, 'location', ''),
+						'tags'          => defaults($contact_details, 'keywords', ''),
+						'about'         => defaults($contact_details, 'about', ''),
+						'account_type'  => Contact::getAccountType($contact_details),
+						'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
+						'inttxt' => ' ' . L10n::t('is interested in:'),
+						'conntxt' => L10n::t('Connect'),
+						'connlnk' => $connlnk,
+						'img_hover' => $jj->tags,
+						'photo_menu' => $photo_menu,
+						'id' => ++$id,
+					];
+					$entries[] = $entry;
 				}
 			}
+
+			$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+
+			$o .= Renderer::replaceMacros($tpl, [
+				'$title'    => L10n::t('Profile Match'),
+				'$contacts' => $entries,
+				'$paginate' => $pager->renderFull($j->total)
+			]);
 		} else {
-			info( t('No matches') . EOL);
+			info(L10n::t('No matches') . EOL);
 		}
-
 	}
 
-	$o .= cleardiv();
-	$o .= paginate($a);
 	return $o;
 }