X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=3645a419da2a6f8a9f48ae9059fdf25dd921b816;hb=6797485f6eea4700d5801afdf7ed7567e4e3fdf1;hp=092595a09c5e91f70e6496c5a7e729468109db6c;hpb=af0f3a7e05a76f50b0f6a8c9091e46faf5d37fcd;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
old mode 100644
new mode 100755
index 092595a09c..3645a419da
--- a/mod/match.php
+++ b/mod/match.php
@@ -7,6 +7,8 @@ function match_content(&$a) {
 	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",
@@ -15,19 +17,23 @@ function match_content(&$a) {
 	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'];
-
-		$x = post_url('http://dir.friendika.com/msearch', $params);
+			
+		if(strlen(get_config('system','directory_submit_url')))
+			$x = post_url('http://dir.friendika.com/msearch', $params);
+		else
+			$x = post_url($a->get_baseurl() . '/msearch', $params);
 
 		$j = json_decode($x);
 
@@ -37,21 +43,31 @@ function match_content(&$a) {
 		}
 
 		if(count($j->results)) {
+
+
+			
+			$tpl = get_markup_template('match.tpl');
 			foreach($j->results as $jj) {
-				$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>';
+				
+				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+				$o .= replace_macros($tpl,array(
+					'$url' => $jj->url,
+					'$name' => $jj->name,
+					'$photo' => $jj->photo,
+					'$inttxt' => ' ' . t('is interested in:'),
+					'$conntxt' => t('Connect'),
+					'$connlnk' => $connlnk,
+					'$tags' => $jj->tags
+				));
 			}
-			$o .= '<div id="profile-match-wrapper-end"></div>';
 		}
 		else {
-			notice( t('No matches') . EOL);
+			info( t('No matches') . EOL);
 		}		
 
 	}
 
+	$o .= cleardiv();
 	$o .= paginate($a);
 	return $o;
-}
\ No newline at end of file
+}