quattro: in post display page, scroll to and flash selected comment

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index ce2ece428ce168a711df2ea3217090f3b1b98338..926df1dfff3203dafee764c8b0eeec107b57601b 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -3,40 +3,71 @@
 
 function match_content(&$a) {
 
+       $o = '';
        if(! local_user())
                return;
 
+       $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
+       $o .= '<h2>' . t('Profile Match') . '</h2>';
+
        $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; 
        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'];
+                       
+               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);
 
-
-               $x = post_url('http://dir.friendika.com/msearch', $params);
                $j = json_decode($x);
 
-               if(count($j)) {
+               if($j->total) {
+                       $a->set_pager_total($j->total);
+                       $a->set_pager_itemspage($j->items_page);
+               }
+
+               if(count($j->results)) {
 
 
-                       foreach($j as $jj) {
-                               $o .= '<a href="' . $jj[1] . '">' . '<img src="' . $jj[2] . '" alt="' . $jj[1] . '" />' . $jj[0] . '</a>';
+                       
+                       $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' => zrl($jj->url),
+                                       '$name' => $jj->name,
+                                       '$photo' => $jj->photo,
+                                       '$inttxt' => ' ' . t('is interested in:'),
+                                       '$conntxt' => t('Connect'),
+                                       '$connlnk' => $connlnk,
+                                       '$tags' => $jj->tags
+                               ));
                        }
                }
                else {
-                       notice( t('No matches') . EOL);
+                       info( t('No matches') . EOL);
                }               
 
        }
+
+       $o .= cleardiv();
+       $o .= paginate($a);
        return $o;
-}
\ No newline at end of file
+}