Fixes:

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 1b4ff69c00285ad4b61f6536b0f4db084d479774..af5ecd9d67011b5daaeace861600026cd7cd3975 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,21 +1,25 @@
 <?php
-
+/**
+ * @file mod/viewcontacts.php
+ */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Nav;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
-require_once('include/contact_selectors.php');
-
-function viewcontacts_init(App $a) {
-
-       if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+function viewcontacts_init(App $a)
+{
+       if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
                return;
        }
 
-       nav_set_selected('home');
+       Nav::setSelected('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)
@@ -29,26 +33,28 @@ function viewcontacts_init(App $a) {
                $a->profile_uid = $r[0]['uid'];
                $is_owner = (local_user() && (local_user() == $a->profile_uid));
 
-               profile_load($a,$a->argv[1]);
+               Profile::load($a, $a->argv[1]);
        }
 }
 
-
-function viewcontacts_content(App $a) {
+function viewcontacts_content(App $a)
+{
        require_once("mod/proxy.php");
 
-       if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
+       if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+               notice(L10n::t('Public access denied.') . EOL);
                return;
        }
 
+       $is_owner = $a->profile['profile_uid'] == local_user();
+
        $o = "";
 
        // tabs
-       $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
+       $o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
 
-       if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
-               notice( t('Permission denied.') . EOL);
+       if (((! count($a->profile)) || ($a->profile['hide-friends']))) {
+               notice(L10n::t('Permission denied.') . EOL);
                return $o;
        }
 
@@ -61,8 +67,9 @@ 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`
                WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
@@ -77,11 +84,11 @@ function viewcontacts_content(App $a) {
                intval($a->pager['itemspage'])
        );
        if (!DBM::is_result($r)) {
-               info(t('No contacts.').EOL);
+               info(L10n::t('No contacts.').EOL);
                return $o;
        }
 
-       $contacts = array();
+       $contacts = [];
 
        foreach ($r as $rr) {
                /// @TODO This triggers an E_NOTICE if 'self' is not there
@@ -89,44 +96,33 @@ function viewcontacts_content(App $a) {
                        continue;
                }
 
-               $url = $rr['url'];
-
-               // route DFRN profiles through the redirect
-
-               $is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false);
-
-               if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
-                       $url = 'redir/' . $rr['id'];
-               else
-                       $url = zrl($url);
-
                $contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
 
-               $contacts[] = array(
+               $contacts[] = [
                        'id' => $rr['id'],
-                       'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
+                       'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
                        'photo_menu' => Contact::photoMenu($rr),
                        'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
-                       'name' => htmlentities(substr($contact_details['name'],0,20)),
+                       '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'  => Contact::getAccountType($contact_details),
-                       'url' => $url,
+                       'url' => Contact::magicLink($rr['url']),
                        'sparkle' => '',
                        'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
-                       'network' => network_to_name($rr['network'], $rr['url']),
-               );
+                       'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
+               ];
        }
 
 
        $tpl = get_markup_template("viewcontact_template.tpl");
-       $o .= replace_macros($tpl, array(
-               '$title' => t('Contacts'),
+       $o .= replace_macros($tpl, [
+               '$title' => L10n::t('Contacts'),
                '$contacts' => $contacts,
                '$paginate' => paginate($a),
-       ));
+       ]);
 
 
        return $o;