X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmatch.php;h=3b0367b4290e1efd02ccbd945eca34fb4e79bb4d;hb=fd8df4c4d6688e5ffd6bc78e14062aa064102715;hp=5dd80fe3efad761e90757e6e34ef31595e076d5d;hpb=e795d1265e9d49439e4af66184d50f6affe079c6;p=friendica.git diff --git a/mod/match.php b/mod/match.php index 5dd80fe3ef..3b0367b429 100644 --- a/mod/match.php +++ b/mod/match.php @@ -1,34 +1,49 @@ ' . t('Profile Match') . ''; + $a->page['aside'] .= findpeople_widget(); + $a->page['aside'] .= follow_widget(); + + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; $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; - } $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.friendika.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); @@ -40,22 +55,57 @@ function match_content(&$a) { } if(count($j->results)) { + + $id = 0; + 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)) { + $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); + $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; + $photo_menu = array(array(t("View Profile"), zrl($jj->url))); + $photo_menu[] = array(t("Connect/Follow"), $connlnk); - $o .= '