use local 'match people with my interests' if global directory is not configured

This commit is contained in:
Friendika 2011-07-02 01:21:56 -07:00
parent fb0e758ce7
commit e6aaa8b59b
2 changed files with 8 additions and 4 deletions

View File

@ -11,8 +11,9 @@ function contacts_init(&$a) {
if($a->config['register_policy'] != REGISTER_CLOSED)
$a->page['aside'] .= '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
if(strlen(get_config('system','directory_submit_url')))
$a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' . t('Find People With Shared Interests') . '</a></div>';
$a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >'
. t('Find People With Shared Interests') . '</a></div>';
$tpl = get_markup_template('follow.tpl');
$a->page['aside'] .= replace_macros($tpl,array(

View File

@ -15,7 +15,7 @@ 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;
}
@ -27,7 +27,10 @@ function match_content(&$a) {
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.friendika.com/msearch', $params);
else
$x = post_url($a->get_baseurl() . '/msearch', $params);
$j = json_decode($x);