Added resize possibility to proxy function

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 2742b4a887844fd14ba6c4eb3774cf1d18b82721..f31b0f67a44fd82cc2a1140a2581ce443a16aae7 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,5 +1,8 @@
 <?php
-
+include_once('include/text.php');
+require_once('include/socgraph.php');
+require_once('include/contact_widgets.php');
+require_once('mod/proxy.php');
 
 function match_content(&$a) {
 
@@ -7,27 +10,38 @@ function match_content(&$a) {
        if(! local_user())
                return;
 
-       $o .= '<h2>' . t('Profile Match') . '</h2>';
+       $a->page['aside'] .= follow_widget();
+       $a->page['aside'] .= findpeople_widget();
+
+       $_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())
        );
        if(! count($r))
-               return; 
+               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')))
+                       $x = post_url(get_server().'/msearch', $params);
+               else
+                       $x = post_url($a->get_baseurl() . '/msearch', $params);
 
                $j = json_decode($x);
 
@@ -37,21 +51,36 @@ function match_content(&$a) {
                }
 
                if(count($j->results)) {
+
+
+
+                       $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
-                               $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->url . ']' . '" /></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>';
+                               $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)) {
+                                       $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
+                                       $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+                                       $o .= replace_macros($tpl,array(
+                                               '$url' => zrl($jj->url),
+                                               '$name' => $jj->name,
+                                               '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                               '$inttxt' => ' ' . t('is interested in:'),
+                                               '$conntxt' => t('Connect'),
+                                               '$connlnk' => $connlnk,
+                                               '$tags' => $jj->tags
+                                       ));
+                               }
                        }
-                       $o .= '<div id="profile-match-wrapper-end"></div>';
-               }
-               else {
+               } else {
                        info( t('No matches') . EOL);
-               }               
+               }
 
        }
 
+       $o .= cleardiv();
        $o .= paginate($a);
        return $o;
 }