Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index ed7c21e4ebe6f4d169dbf10d98fde9f321df0ca2..f7274e436666e727f0cd57c3d2c3c0964dfbf2a8 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -13,22 +13,24 @@ require_once('mod/proxy.php');
  * @param App &$a
  * @return void|string
  */
-function match_content(&$a) {
+function match_content(App &$a) {
 
        $o = '';
-       if(! local_user())
+       if (! local_user()) {
                return;
+       }
 
        $a->page['aside'] .= findpeople_widget();
        $a->page['aside'] .= follow_widget();
 
-       $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+       $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
 
        $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval(local_user())
        );
-       if(! count($r))
+       if (! dbm::is_result($r)) {
                return;
+       }
        if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
                notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
                return;
@@ -45,7 +47,7 @@ function match_content(&$a) {
                if(strlen(get_config('system','directory')))
                        $x = post_url(get_server().'/msearch', $params);
                else
-                       $x = post_url($a->get_baseurl() . '/msearch', $params);
+                       $x = post_url(App::get_baseurl() . '/msearch', $params);
 
                $j = json_decode($x);
 
@@ -66,14 +68,22 @@ function match_content(&$a) {
 
                                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);
+                                       $connlnk = App::get_baseurl() . '/follow/?url=' . $jj->url;
+                                       $photo_menu = array(
+                                               'profile' => array(t("View Profile"), zrl($jj->url)),
+                                               'follow' => array(t("Connect/Follow"), $connlnk)
+                                       );
+
+                                       $contact_details = get_contact_details_by_url($jj->url, local_user());
 
                                        $entry = array(
                                                'url' => zrl($jj->url),
-                                               'itemurl' => $jj->url,
+                                               'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
                                                'name' => $jj->name,
+                                               'details'       => $contact_details['location'],
+                                               'tags'          => $contact_details['keywords'],
+                                               'about'         => $contact_details['about'],
+                                               'account_type'  => account_type($contact_details),
                                                'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
                                                'inttxt' => ' ' . t('is interested in:'),
                                                'conntxt' => t('Connect'),
@@ -82,8 +92,8 @@ function match_content(&$a) {
                                                'photo_menu' => $photo_menu,
                                                'id' => ++$id,
                                        );
+                                       $entries[] = $entry;
                                }
-                               $entries[] = $entry;
                        }
 
                $tpl = get_markup_template('viewcontact_template.tpl');