X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmatch.php;h=926df1dfff3203dafee764c8b0eeec107b57601b;hb=49098ed11d9c51610088758ac7a78530d4b52676;hp=092595a09c5e91f70e6496c5a7e729468109db6c;hpb=f0bd849555bab45e65b5a107560f801a9ddcfafd;p=friendica.git
diff --git a/mod/match.php b/mod/match.php
index 092595a09c..926df1dfff 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -7,6 +7,8 @@ function match_content(&$a) {
if(! local_user())
return;
+ $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
$o .= '
' . t('Profile Match') . '
';
$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
@@ -15,19 +17,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,21 +43,31 @@ function match_content(&$a) {
}
if(count($j->results)) {
+
+
+
+ $tpl = get_markup_template('match.tpl');
foreach($j->results as $jj) {
- $o .= '';
- $o .= '
';
- $o .= '
';
- $o .= '
';
+
+ $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+ $o .= replace_macros($tpl,array(
+ '$url' => zrl($jj->url),
+ '$name' => $jj->name,
+ '$photo' => $jj->photo,
+ '$inttxt' => ' ' . t('is interested in:'),
+ '$conntxt' => t('Connect'),
+ '$connlnk' => $connlnk,
+ '$tags' => $jj->tags
+ ));
}
- $o .= '';
}
else {
- notice( t('No matches') . EOL);
+ info( t('No matches') . EOL);
}
}
+ $o .= cleardiv();
$o .= paginate($a);
return $o;
-}
\ No newline at end of file
+}