Merge pull request #157 from tobiasd/master

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index ce2ece428ce168a711df2ea3217090f3b1b98338..5dd80fe3efad761e90757e6e34ef31595e076d5d 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -3,16 +3,19 @@
 
 function match_content(&$a) {
 
+       $o = '';
        if(! local_user())
                return;
 
+       $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;
 
        }
@@ -21,22 +24,38 @@ function match_content(&$a) {
        $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);
+               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->results as $jj) {
 
-                       foreach($j as $jj) {
-                               $o .= '<a href="' . $jj[1] . '">' . '<img src="' . $jj[2] . '" alt="' . $jj[1] . '" />' . $jj[0] . '</a>';
+                               $o .= '<div class="profile-match-wrapper"><div class="profile-match-photo">';
+                               $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" title="' . $jj->name . '[' . $jj->tags . ']' . '" /></a></div>';
+                               $o .= '<div class="profile-match-break"></div>';
+                               $o .= '<div class="profile-match-name"><a href="' . $jj->url . '" title="' . $jj->name . '[' . $jj->url .']' . '">' . $jj->name . '</a></div>';
+                               $o .= '<div class="profile-match-end"></div></div>';
                        }
+                       $o .= '<div id="profile-match-wrapper-end"></div>';
                }
                else {
-                       notice( t('No matches') . EOL);
+                       info( t('No matches') . EOL);
                }               
 
        }
+
+       $o .= paginate($a);
        return $o;
-}
\ No newline at end of file
+}