X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=0ec753466267a738fd626ba922abecafec02332b;hb=1c58363696f3837d5deb882d6090bf1df2da4b0f;hp=2824e6b71dfdc8bdbf30ac31ecf2e52cb0279067;hpb=2ad162f991fdd32122b029398b9ab9e8801c0462;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 2824e6b71d..0ec7534662 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,14 +1,22 @@
 <?php
+/**
+ * @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\DBM;
+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');
-require_once('include/socgraph.php');
-require_once('include/contact_widgets.php');
-require_once('mod/proxy.php');
+require_once 'include/text.php';
 
 /**
  * @brief Controller for /match.
@@ -16,105 +24,106 @@ require_once('mod/proxy.php');
  * It takes keywords from your profile and queries the directory server for
  * matching keywords from other profiles.
  *
- * @param App $a
+ * @param App $a App
+ *
  * @return void|string
  */
-function match_content(App $a) {
-
+function match_content(App $a)
+{
 	$o = '';
 	if (! local_user()) {
 		return;
 	}
 
-	$a->page['aside'] .= findpeople_widget();
-	$a->page['aside'] .= follow_widget();
+	$a->page['aside'] .= Widget::findPeople();
+	$a->page['aside'] .= Widget::follow();
 
-	$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
+	$_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 (! DBM::is_result($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) {
+	if ($tags) {
+		$pager = new Pager($a->query_string);
+
 		$params['s'] = $tags;
-		if($a->pager['page'] != 1)
-			$params['p'] = $a->pager['page'];
+		if ($pager->getPage() != 1) {
+			$params['p'] = $pager->getPage();
+		}
 
-		if(strlen(Config::get('system','directory')))
-			$x = post_url(get_server().'/msearch', $params);
-		else
-			$x = post_url(System::baseUrl() . '/msearch', $params);
+		if (strlen(Config::get('system', 'directory'))) {
+			$x = Network::post(get_server().'/msearch', $params)->getBody();
+		} else {
+			$x = Network::post(System::baseUrl() . '/msearch', $params)->getBody();
+		}
 
 		$j = json_decode($x);
 
-		if($j->total) {
-			$a->set_pager_total($j->total);
-			$a->set_pager_itemspage($j->items_page);
-		}
-
-		if(count($j->results)) {
+		if (count($j->results)) {
+			$pager->setItemsPerPage($j->items_page);
 
 			$id = 0;
 
-			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 = System::baseUrl() . '/follow/?url=' . $jj->url;
-					$photo_menu = array(
-						'profile' => array(t("View Profile"), zrl($jj->url)),
-						'follow' => array(t("Connect/Follow"), $connlnk)
-					);
+					$photo_menu = [
+						'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
+						'follow' => [L10n::t("Connect/Follow"), $connlnk]
+					];
 
-					$contact_details = get_contact_details_by_url($jj->url, local_user());
+					$contact_details = Contact::getDetailsByURL($jj->url, local_user());
 
-					$entry = array(
-						'url' => zrl($jj->url),
-						'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
+					$entry = [
+						'url' => Contact::magicLink($jj->url),
+						'itemurl' => defaults($contact_details, 'addr', $jj->url),
 						'name' => $jj->name,
-						'details'       => $contact_details['location'],
-						'tags'          => $contact_details['keywords'],
-						'about'         => $contact_details['about'],
-						'account_type'  => account_type($contact_details),
-						'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-						'inttxt' => ' ' . t('is interested in:'),
-						'conntxt' => t('Connect'),
+						'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 = get_markup_template('viewcontact_template.tpl');
+			$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-		$o .= replace_macros($tpl,array(
-			'$title' => t('Profile Match'),
-			'$contacts' => $entries,
-			'$paginate' => paginate($a),
-		));
-
-		}
-		else {
-			info( t('No matches') . EOL);
+			$o .= Renderer::replaceMacros($tpl, [
+				'$title'    => L10n::t('Profile Match'),
+				'$contacts' => $entries,
+				'$paginate' => $pager->renderFull($j->total)
+			]);
+		} else {
+			info(L10n::t('No matches') . EOL);
 		}
-
 	}
 
 	return $o;