Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index f31b0f67a44fd82cc2a1140a2581ce443a16aae7..f7274e436666e727f0cd57c3d2c3c0964dfbf2a8 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -4,30 +4,36 @@ require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 require_once('mod/proxy.php');
 
-function match_content(&$a) {
+/**
+ * @brief Controller for /match.
+ *
+ * It takes keywords from your profile and queries the directory server for
+ * matching keywords from other profiles.
+ *
+ * @param App &$a
+ * @return void|string
+ */
+function match_content(App &$a) {
 
        $o = '';
-       if(! local_user())
+       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;
-
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => t('Profile Match')
-       ));
+       $_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;
-
        }
 
        $params = array();
@@ -41,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);
 
@@ -52,35 +58,58 @@ function match_content(&$a) {
 
                if(count($j->results)) {
 
+                       $id = 0;
 
-
-                       $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)) {
                                        $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
-                                       ));
+                                       $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' => (($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'),
+                                               'connlnk' => $connlnk,
+                                               'img_hover' => $jj->tags,
+                                               'photo_menu' => $photo_menu,
+                                               'id' => ++$id,
+                                       );
+                                       $entries[] = $entry;
                                }
                        }
-               } else {
+
+               $tpl = get_markup_template('viewcontact_template.tpl');
+
+               $o .= replace_macros($tpl,array(
+                       '$title' => t('Profile Match'),
+                       '$contacts' => $entries,
+                       '$paginate' => paginate($a),
+               ));
+
+               }
+               else {
                        info( t('No matches') . EOL);
                }
 
        }
 
-       $o .= cleardiv();
-       $o .= paginate($a);
        return $o;
 }