Merge pull request #1547 from tobiasd/2014-05-06-match

avoid some contacts from profile match listing

mod/match.php

@@ -1,5 +1,5 @@
 <?php
-
+include_once('include/text.php');
 
 function match_content(&$a) {
 
@@ -48,17 +48,23 @@ function match_content(&$a) {
 			
 			$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)) {
 				
 				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
 				$o .= replace_macros($tpl,array(
 					'$url' => zrl($jj->url),
 					'$name' => $jj->name,
-					'$photo' => $jj->photo,
+					'$photo' => proxy_url($jj->photo),
 					'$inttxt' => ' ' . t('is interested in:'),
 					'$conntxt' => t('Connect'),
 					'$connlnk' => $connlnk,
 					'$tags' => $jj->tags
 				));
+			    }
 			}
 		}
 		else {