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

avoid some contacts from profile match listing
This commit is contained in:
Michael Vogel 2015-05-10 10:12:16 +02:00
commit 362d3214ba

View file

@ -1,5 +1,5 @@
<?php <?php
include_once('include/text.php');
function match_content(&$a) { function match_content(&$a) {
@ -48,12 +48,17 @@ function match_content(&$a) {
$tpl = get_markup_template('match.tpl'); $tpl = get_markup_template('match.tpl');
foreach($j->results as $jj) { 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; $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$url' => zrl($jj->url), '$url' => zrl($jj->url),
'$name' => $jj->name, '$name' => $jj->name,
'$photo' => $jj->photo, '$photo' => proxy_url($jj->photo),
'$inttxt' => ' ' . t('is interested in:'), '$inttxt' => ' ' . t('is interested in:'),
'$conntxt' => t('Connect'), '$conntxt' => t('Connect'),
'$connlnk' => $connlnk, '$connlnk' => $connlnk,
@ -61,6 +66,7 @@ function match_content(&$a) {
)); ));
} }
} }
}
else { else {
info( t('No matches') . EOL); info( t('No matches') . EOL);
} }