Add Contact Object

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index f7274e436666e727f0cd57c3d2c3c0964dfbf2a8..b5e1ea31fa35398bafaacd2d489e7d2232dc44b5 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,8 +1,16 @@
 <?php
-include_once('include/text.php');
-require_once('include/socgraph.php');
-require_once('include/contact_widgets.php');
-require_once('mod/proxy.php');
+/**
+ * @file mod/match.php
+ */
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+
+require_once 'include/text.php';
+require_once 'include/contact_widgets.php';
+require_once 'mod/proxy.php';
 
 /**
  * @brief Controller for /match.
@@ -10,11 +18,12 @@ require_once('mod/proxy.php');
  * It takes keywords from your profile and queries the directory server for
  * matching keywords from other profiles.
  *
- * @param App &$a
+ * @param App $a App
+ *
  * @return void|string
  */
-function match_content(App &$a) {
-
+function match_content(App $a)
+{
        $o = '';
        if (! local_user()) {
                return;
@@ -23,52 +32,56 @@ function match_content(App &$a) {
        $a->page['aside'] .= findpeople_widget();
        $a->page['aside'] .= follow_widget();
 
-       $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+       $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
 
-       $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
+       $r = q(
+               "SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval(local_user())
        );
-       if (! dbm::is_result($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);
+       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();
        $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
 
-       if($tags) {
+       if ($tags) {
                $params['s'] = $tags;
-               if($a->pager['page'] != 1)
+               if ($a->pager['page'] != 1) {
                        $params['p'] = $a->pager['page'];
+               }
 
-               if(strlen(get_config('system','directory')))
+               if (strlen(Config::get('system', 'directory'))) {
                        $x = post_url(get_server().'/msearch', $params);
-               else
-                       $x = post_url(App::get_baseurl() . '/msearch', $params);
+               } else {
+                       $x = post_url(System::baseUrl() . '/msearch', $params);
+               }
 
                $j = json_decode($x);
 
-               if($j->total) {
+               if ($j->total) {
                        $a->set_pager_total($j->total);
                        $a->set_pager_itemspage($j->items_page);
                }
 
-               if(count($j->results)) {
-
+               if (count($j->results)) {
                        $id = 0;
 
-                       foreach($j->results as $jj) {
+                       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",
+                               $match = q(
+                                       "SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
                                        intval(local_user()),
-                                       dbesc($match_nurl));
+                                       dbesc($match_nurl)
+                               );
 
                                if (!count($match)) {
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
-                                       $connlnk = App::get_baseurl() . '/follow/?url=' . $jj->url;
+                                       $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
                                        $photo_menu = array(
                                                'profile' => array(t("View Profile"), zrl($jj->url)),
                                                'follow' => array(t("Connect/Follow"), $connlnk)
@@ -96,19 +109,18 @@ function match_content(App &$a) {
                                }
                        }
 
-               $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);
+                       $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);
                }
-
        }
 
        return $o;