added more curyl braces + spaces between "if" and brace

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index f6174da66cd919d9c6e02effda70bf438e973e2e..69bf3c1101142f33bdd98c3ef40669d12f0d46c5 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -19,16 +19,17 @@ 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;
 
        $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;
@@ -67,12 +68,21 @@ 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);
+                                       $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' => (($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'),
@@ -81,8 +91,8 @@ function match_content(&$a) {
                                                'photo_menu' => $photo_menu,
                                                'id' => ++$id,
                                        );
+                                       $entries[] = $entry;
                                }
-                               $entries[] = $entry;
                        }
 
                $tpl = get_markup_template('viewcontact_template.tpl');