Bugfix: The user id wasn't fetched correctly.

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index c33bbd5c2de7b5d9deaec1463df9fdb95252bf63..7773636420658cc015c2db7a4076d5ad9e40b589 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,5 +1,5 @@
 <?php
-
+include_once('include/text.php');
 
 function match_content(&$a) {
 
@@ -7,7 +7,11 @@ function match_content(&$a) {
        if(! local_user())
                return;
 
-       $o .= '<h2>' . t('Profile Match') . '</h2>';
+       $_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())
@@ -29,7 +33,7 @@ function match_content(&$a) {
                        $params['p'] = $a->pager['page'];
                        
                if(strlen(get_config('system','directory_submit_url')))
-                       $x = post_url('http://dir.friendika.com/msearch', $params);
+                       $x = post_url('http://dir.friendica.com/msearch', $params);
                else
                        $x = post_url($a->get_baseurl() . '/msearch', $params);
 
@@ -41,16 +45,28 @@ function match_content(&$a) {
                }
 
                if(count($j->results)) {
+
+
                        
                        $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
+                           $match_nurl = normalise_link($jj->url);
+                           $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
+                               intval(local_user()),
+                               dbesc($match_nurl));
+                           if (!count($match)) {
                                
+                               $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
                                $o .= replace_macros($tpl,array(
-                                       '$url' => $jj->url,
+                                       '$url' => zrl($jj->url),
                                        '$name' => $jj->name,
-                                       '$photo' => $jj->photo,
+                                       '$photo' => proxy_url($jj->photo),
+                                       '$inttxt' => ' ' . t('is interested in:'),
+                                       '$conntxt' => t('Connect'),
+                                       '$connlnk' => $connlnk,
                                        '$tags' => $jj->tags
                                ));
+                           }
                        }
                }
                else {