X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=74f83a6cc9494b76ce1fac8b7d902f400e9a5aae;hb=d80888842926eba272ae0e86d7666daeef201dc3;hp=1ae7848a63ac19caae3d0d2637f87484269e1d54;hpb=1cfff8fdd11e0e67e2bdb7ae85b9caf8106a734b;p=friendica.git
diff --git a/mod/match.php b/mod/match.php
old mode 100755
new mode 100644
index 1ae7848a63..74f83a6cc9
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,5 +1,7 @@
page['aside'] .= follow_widget();
+ $a->page['aside'] .= findpeople_widget();
+
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
- $o .= '
' . t('Profile Match') . '
';
+ $o .= replace_macros(get_markup_template("section_title.tpl"),array(
+ '$title' => t('Profile Match')
+ ));
$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;
@@ -24,14 +31,14 @@ function match_content(&$a) {
$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);
+
+ if(strlen(get_config('system','directory')))
+ $x = post_url(get_server().'/msearch', $params);
else
$x = post_url($a->get_baseurl() . '/msearch', $params);
@@ -45,25 +52,30 @@ function match_content(&$a) {
if(count($j->results)) {
-
+
$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' => $jj->url,
- '$name' => $jj->name,
- '$photo' => $jj->photo,
- '$inttxt' => ' ' . t('is interested in:'),
- '$conntxt' => t('Connect'),
- '$connlnk' => $connlnk,
- '$tags' => $jj->tags
- ));
+ $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;
+ $o .= replace_macros($tpl,array(
+ '$url' => zrl($jj->url),
+ '$name' => $jj->name,
+ '$photo' => proxy_url($jj->photo),
+ '$inttxt' => ' ' . t('is interested in:'),
+ '$conntxt' => t('Connect'),
+ '$connlnk' => $connlnk,
+ '$tags' => $jj->tags
+ ));
+ }
}
- }
- else {
+ } else {
info( t('No matches') . EOL);
- }
+ }
}