X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=926df1dfff3203dafee764c8b0eeec107b57601b;hb=d0775be2e28db6a0418e0065f501f1665a05724c;hp=58c81a0cdd4b43238f31b25426d1bcbff2e2120a;hpb=ee1dff998047834319464ff10c16679aefcfdfab;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 58c81a0cdd..926df1dfff 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -3,40 +3,71 @@
 
 function match_content(&$a) {
 
+	$o = '';
 	if(! local_user())
 		return;
 
+	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
+	$o .= '<h2>' . t('Profile Match') . '</h2>';
+
 	$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; 
 	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
-		notice('No keywords to match. Please add keywords to your default profile.');
+		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.friendica.com/msearch', $params);
+		else
+			$x = post_url($a->get_baseurl() . '/msearch', $params);
 
+		$j = json_decode($x);
 
-		$x = post_url('http://dir.friendika.com/msearch', $params);
+		if($j->total) {
+			$a->set_pager_total($j->total);
+			$a->set_pager_itemspage($j->items_page);
+		}
 
-		$j = json_decode($x);
+		if(count($j->results)) {
 
-		if(count($j)) {
-			foreach($j as $jj) {
 
-				$o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" />' . $jj->name . '</a>';
+			
+			$tpl = get_markup_template('match.tpl');
+			foreach($j->results as $jj) {
+				
+				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+				$o .= replace_macros($tpl,array(
+					'$url' => zrl($jj->url),
+					'$name' => $jj->name,
+					'$photo' => $jj->photo,
+					'$inttxt' => ' ' . t('is interested in:'),
+					'$conntxt' => t('Connect'),
+					'$connlnk' => $connlnk,
+					'$tags' => $jj->tags
+				));
 			}
 		}
 		else {
-			notice( t('No matches') . EOL);
+			info( t('No matches') . EOL);
 		}		
 
 	}
+
+	$o .= cleardiv();
+	$o .= paginate($a);
 	return $o;
-}
\ No newline at end of file
+}