Merge pull request #3985 from hoergen/develop

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 1001f03cc2cbacc715d1018b4b1c968d591b88a9..30ae92f8e32e7d2a6a5c530bc380b2109cc56a1b 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,22 +1,27 @@
 <?php
-require_once('include/Contact.php');
+
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+
 require_once('include/contact_selectors.php');
 
 function viewcontacts_init(App $a) {
 
-       if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
                return;
        }
 
        nav_set_selected('home');
 
-       if ($a->argc > 1) {
+       if($a->argc > 1) {
                $nick = $a->argv[1];
                $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
                        dbesc($nick)
                );
 
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        return;
                }
 
@@ -32,7 +37,7 @@ function viewcontacts_init(App $a) {
 function viewcontacts_content(App $a) {
        require_once("mod/proxy.php");
 
-       if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
        }
@@ -42,7 +47,7 @@ function viewcontacts_content(App $a) {
        // tabs
        $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
 
-       if (((! count($a->profile)) || ($a->profile['hide-friends']))) {
+       if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
                notice( t('Permission denied.') . EOL);
                return $o;
        }
@@ -56,7 +61,7 @@ function viewcontacts_content(App $a) {
                dbesc(NETWORK_DIASPORA),
                dbesc(NETWORK_OSTATUS)
        );
-       if (dbm::is_result($r))
+       if (DBM::is_result($r))
                $a->set_pager_total($r[0]['total']);
 
        $r = q("SELECT * FROM `contact`
@@ -71,7 +76,7 @@ function viewcontacts_content(App $a) {
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
-       if (!dbm::is_result($r)) {
+       if (!DBM::is_result($r)) {
                info(t('No contacts.').EOL);
                return $o;
        }
@@ -90,25 +95,24 @@ function viewcontacts_content(App $a) {
 
                $is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false);
 
-               if ($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
+               if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
                        $url = 'redir/' . $rr['id'];
-               } else {
+               else
                        $url = zrl($url);
-               }
 
-               $contact_details = get_contact_details_by_url($rr['url'], $a->profile['uid'], $rr);
+               $contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
 
                $contacts[] = array(
                        'id' => $rr['id'],
                        'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
-                       'photo_menu' => contact_photo_menu($rr),
+                       'photo_menu' => Contact::photoMenu($rr),
                        'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
                        'name' => htmlentities(substr($contact_details['name'],0,20)),
                        'username' => htmlentities($contact_details['name']),
                        'details'       => $contact_details['location'],
                        'tags'          => $contact_details['keywords'],
                        'about'         => $contact_details['about'],
-                       'account_type'  => account_type($contact_details),
+                       'account_type'  => Contact::getAccountType($contact_details),
                        'url' => $url,
                        'sparkle' => '',
                        'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),