X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=8341911577be4311375e31b5432bcc503b69e542;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=380f6e74a44e58cc95ea168444af91c2f44c63c6;hpb=dbf1f9efcd929894864262fb44bce0cafe7aad9e;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 380f6e74a4..8341911577 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -19,8 +19,8 @@ function match_content(&$a) {
 	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;
 
@@ -56,32 +56,49 @@ function match_content(&$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",
 					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;
+					$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,
-						'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+						'details'       => $contact_details['location'],
+						'tags'          => $contact_details['keywords'],
+						'about'         => $contact_details['about'],
+						'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
+						'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
 						'inttxt' => ' ' . t('is interested in:'),
 						'conntxt' => t('Connect'),
 						'connlnk' => $connlnk,
-						'tags' => $jj->tags
+						'img_hover' => $jj->tags,
+						'photo_menu' => $photo_menu,
+						'id' => ++$id,
 					);
 					$entries[] = $entry;
 				}
 			}
 
-		$tpl = get_markup_template('match.tpl');
+		$tpl = get_markup_template('viewcontact_template.tpl');
 
 		$o .= replace_macros($tpl,array(
 			'$title' => t('Profile Match'),
-			'entries' => $entries,
+			'$contacts' => $entries,
 			'$paginate' => paginate($a),
 		));