X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=3b0367b4290e1efd02ccbd945eca34fb4e79bb4d;hb=39b37281a78b58b50503056e69b2aaa9885257b0;hp=4316d8bd70f4aad904376c46b622a1dd4729e44b;hpb=e6aaa8b59b138f4195fb7f1e93b9b14980c309c3;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 4316d8bd70..3b0367b429 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,34 +1,49 @@
 <?php
+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;
 
-	$o .= '<h2>' . t('Profile Match') . '</h2>';
+	$a->page['aside'] .= findpeople_widget();
+	$a->page['aside'] .= follow_widget();
+
+	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
 	if(! count($r))
-		return; 
+		return;
 	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();
 	$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_submit_url')))
-			$x = post_url('http://dir.friendika.com/msearch', $params);
+
+		if(strlen(get_config('system','directory')))
+			$x = post_url(get_server().'/msearch', $params);
 		else
 			$x = post_url($a->get_baseurl() . '/msearch', $params);
 
@@ -40,22 +55,57 @@ 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(array(t("View Profile"), zrl($jj->url)));
+					$photo_menu[] = array(t("Connect/Follow"), $connlnk);
 
-				$o .= '<div class="profile-match-wrapper"><div class="profile-match-photo">';
-				$o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" title="' . $jj->name . '[' . $jj->url . ']' . '" /></a></div>';
-				$o .= '<div class="profile-match-break"></div>';
-				$o .= '<div class="profile-match-name"><a href="' . $jj->url . '" title="' . $jj->name . '[' . $jj->url .']' . '">' . $jj->name . '</a></div>';
-				$o .= '<div class="profile-match-end"></div></div>';
+					$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'  => (($contact_details['community']) ? t('Forum') : ''),
+						'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;
+				}
 			}
-			$o .= '<div id="profile-match-wrapper-end"></div>';
+
+		$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 .= paginate($a);
 	return $o;
 }