X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fmatch.php;h=7773636420658cc015c2db7a4076d5ad9e40b589;hb=e54414692e6b302cbd3bee88587d3f12c812bf1a;hp=12138a26c71dbcfaffbbd2a332406340bcda1d26;hpb=9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21;p=friendica.git diff --git a/mod/match.php b/mod/match.php index 12138a26c7..7773636420 100644 --- a/mod/match.php +++ b/mod/match.php @@ -1,5 +1,5 @@ ' . t('Profile Match') . ''; + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; + + $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()) @@ -15,19 +19,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.friendica.com/msearch', $params); + else + $x = post_url($a->get_baseurl() . '/msearch', $params); $j = json_decode($x); @@ -37,15 +45,29 @@ function match_content(&$a) { } if(count($j->results)) { - foreach($j->results as $jj) { - $o .= '