X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=3a0d10c3191873f05590bdbdf6aece32209bf629;hb=f22fe7118d52251dbd0898279ef078b797885ec4;hp=baffb3d077540e566e9ab4ae8825e3ea9a5cb803;hpb=0cd241bcbe762e38e2eba0c58800eb60a2240e36;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index baffb3d077..3a0d10c319 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,8 +1,16 @@
 <?php
-include_once('include/text.php');
-require_once('include/socgraph.php');
-require_once('include/contact_widgets.php');
-require_once('mod/proxy.php');
+/**
+ * @file mod/match.php
+ */
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+
+require_once 'include/text.php';
+require_once 'include/contact_widgets.php';
+require_once 'mod/proxy.php';
 
 /**
  * @brief Controller for /match.
@@ -10,11 +18,12 @@ 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;
@@ -23,16 +32,17 @@ function match_content(App $a) {
 	$a->page['aside'] .= findpeople_widget();
 	$a->page['aside'] .= follow_widget();
 
-	$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+	$_SESSION['return_url'] = System::baseUrl() . '/' . $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 (! DBM::is_result($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);
+		notice(t('No keywords to match. Please add keywords to your default profile.') . EOL);
 		return;
 	}
 
@@ -41,13 +51,15 @@ function match_content(App $a) {
 
 	if ($tags) {
 		$params['s'] = $tags;
-		if ($a->pager['page'] != 1)
+		if ($a->pager['page'] != 1) {
 			$params['p'] = $a->pager['page'];
+		}
 
-		if (strlen(get_config('system','directory')))
+		if (strlen(Config::get('system', 'directory'))) {
 			$x = post_url(get_server().'/msearch', $params);
-		else
-			$x = post_url(App::get_baseurl() . '/msearch', $params);
+		} else {
+			$x = post_url(System::baseUrl() . '/msearch', $params);
+		}
 
 		$j = json_decode($x);
 
@@ -57,24 +69,25 @@ function match_content(App $a) {
 		}
 
 		if (count($j->results)) {
-
 			$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",
+				$match = q(
+					"SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
 					intval(local_user()),
-					dbesc($match_nurl));
+					dbesc($match_nurl)
+				);
 
 				if (!count($match)) {
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
-					$connlnk = App::get_baseurl() . '/follow/?url=' . $jj->url;
+					$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
 					$photo_menu = array(
 						'profile' => array(t("View Profile"), zrl($jj->url)),
 						'follow' => array(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),
@@ -83,7 +96,7 @@ function match_content(App $a) {
 						'details'       => $contact_details['location'],
 						'tags'          => $contact_details['keywords'],
 						'about'         => $contact_details['about'],
-						'account_type'  => account_type($contact_details),
+						'account_type'  => Contact::getAccountType($contact_details),
 						'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
 						'inttxt' => ' ' . t('is interested in:'),
 						'conntxt' => t('Connect'),
@@ -96,19 +109,18 @@ function match_content(App $a) {
 				}
 			}
 
-		$tpl = get_markup_template('viewcontact_template.tpl');
-
-		$o .= replace_macros($tpl,array(
-			'$title' => t('Profile Match'),
-			'$contacts' => $entries,
-			'$paginate' => paginate($a),
-		));
-
-		}
-		else {
-			info( t('No matches') . EOL);
+			$tpl = get_markup_template('viewcontact_template.tpl');
+
+			$o .= replace_macros(
+				$tpl,
+				array(
+				'$title' => t('Profile Match'),
+				'$contacts' => $entries,
+				'$paginate' => paginate($a))
+			);
+		} else {
+			info(t('No matches') . EOL);
 		}
-
 	}
 
 	return $o;