Merge pull request #2151 from annando/1512-misconfigured-friendica

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 380f6e74a44e58cc95ea168444af91c2f44c63c6..3b0367b4290e1efd02ccbd945eca34fb4e79bb4d 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -19,8 +19,8 @@ function match_content(&$a) {
        if(! local_user())
                return;
 
-       $a->page['aside'] .= follow_widget();
        $a->page['aside'] .= findpeople_widget();
+       $a->page['aside'] .= follow_widget();
 
        $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
@@ -56,32 +56,47 @@ function match_content(&$a) {
 
                if(count($j->results)) {
 
+                       $id = 0;
+
                        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)) {
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
                                        $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+                                       $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+                                       $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+
+                                       $contact_details = get_contact_details_by_url($jj->url, local_user());
+
                                        $entry = array(
                                                'url' => zrl($jj->url),
+                                               'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
                                                'name' => $jj->name,
-                                               'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                               'details'       => $contact_details['location'],
+                                               'tags'          => $contact_details['keywords'],
+                                               'about'         => $contact_details['about'],
+                                               'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
+                                               'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
                                                'inttxt' => ' ' . t('is interested in:'),
                                                'conntxt' => t('Connect'),
                                                'connlnk' => $connlnk,
-                                               'tags' => $jj->tags
+                                               'img_hover' => $jj->tags,
+                                               'photo_menu' => $photo_menu,
+                                               'id' => ++$id,
                                        );
                                        $entries[] = $entry;
                                }
                        }
 
-               $tpl = get_markup_template('match.tpl');
+               $tpl = get_markup_template('viewcontact_template.tpl');
 
                $o .= replace_macros($tpl,array(
                        '$title' => t('Profile Match'),
-                       'entries' => $entries,
+                       '$contacts' => $entries,
                        '$paginate' => paginate($a),
                ));