X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=33e07c91ce40fbcf9614d0aca83040756c49c8b0;hb=27a2e44d8949eda0dacb54eedcdec92843ac6fe3;hp=74f83a6cc9494b76ce1fac8b7d902f400e9a5aae;hpb=4b6afbf6814acde5151edc74f0b6cf1fd7685432;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 74f83a6cc9..33e07c91ce 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -2,22 +2,28 @@
 include_once('include/text.php');
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
-
+require_once('mod/proxy.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
+ * @return void|string
+ */
 function match_content(&$a) {
 
 	$o = '';
 	if(! local_user())
 		return;
 
-	$a->page['aside'] .= follow_widget();
 	$a->page['aside'] .= findpeople_widget();
+	$a->page['aside'] .= follow_widget();
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-		'$title' => t('Profile Match')
-	));
-
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
@@ -26,7 +32,6 @@ function match_content(&$a) {
 	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
 		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
 		return;
-
 	}
 
 	$params = array();
@@ -51,35 +56,58 @@ function match_content(&$a) {
 
 		if(count($j->results)) {
 
+			$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",
 					intval(local_user()),
 					dbesc($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
-					));
+					$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());
+
+					$entry = array(
+						'url' => zrl($jj->url),
+						'itemurl' => (($contact_details['addr'] != "") ? $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'),
+						'connlnk' => $connlnk,
+						'img_hover' => $jj->tags,
+						'photo_menu' => $photo_menu,
+						'id' => ++$id,
+					);
+					$entries[] = $entry;
 				}
 			}
-		} else {
+
+		$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);
 		}
 
 	}
 
-	$o .= cleardiv();
-	$o .= paginate($a);
 	return $o;
 }