Fix wrong parameter order

[friendica.git] / view / theme / frio / theme.php

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 0202fda0efb2ed6fd56c9632e1927c1dd32989b4..4b070e99af53e21ad825154d91632d25c3a3890e 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -17,6 +17,7 @@ use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
+use Friendica\Model\Contact;
 use Friendica\Module;
 use Friendica\Util\Strings;
 
@@ -54,18 +55,6 @@ function frio_install()
        Logger::log('installed theme frio');
 }
 
-function frio_uninstall()
-{
-       Hook::unregister('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links');
-       Hook::unregister('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu');
-       Hook::unregister('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
-       Hook::unregister('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
-       Hook::unregister('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
-       Hook::unregister('display_item', 'view/theme/frio/theme.php', 'frio_display_item');
-
-       Logger::log('uninstalled theme frio');
-}
-
 /**
  * Replace friendica photo links hook
  *
@@ -202,55 +191,28 @@ function frio_remote_nav($a, &$nav)
                $homelink = Session::get('visitor_home', '');
        }
 
-       // split up the url in it's parts (protocol,domain/directory, /profile/, nickname
-       // I'm not familiar with regex, so someone might find a better solutionen
-       //
-       // E.g $homelink = 'https://friendica.domain.com/profile/mickey' should result in an array
-       // with 0 => 'https://friendica.domain.com/profile/mickey' 1 => 'https://',
-       // 2 => 'friendica.domain.com' 3 => '/profile/' 4 => 'mickey'
-       //
-       //$server_url = preg_match('/^(https?:\/\/.*?)\/profile\//2', $homelink);
-       preg_match('/^(https?:\/\/)?(.*?)(\/profile\/)(.*)/', $homelink, $url_parts);
-
-       // Construct the server url of the visitor. So we could link back to his/her own menu.
-       // And construct a webbie (e.g. mickey@friendica.domain.com for the search in gcontact
-       // We use the webbie for search in gcontact because we don't know if gcontact table stores
-       // the right value if its http or https protocol
-       $webbie = '';
-       if (count($url_parts)) {
-               $server_url = $url_parts[1] . $url_parts[2];
-               $webbie = $url_parts[4] . '@' . $url_parts[2];
-       }
-
        // since $userinfo isn't available for the hook we write it to the nav array
        // this isn't optimal because the contact query will be done now twice
-       if (local_user()) {
-               // empty the server url for local user because we won't need it
-               $server_url = '';
-               // user info
-               $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
-
-               $r[0]['photo'] = (DBA::isResult($r) ? DI::baseUrl()->remove($r[0]['micro']) : 'images/person-48.jpg');
-               $r[0]['name'] = $a->user['username'];
+       $fields = ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl'];
+       if (local_user() && !empty($a->user['uid'])) {
+               $remoteUser = Contact::getById($a->user['uid'], $fields);
+               $remoteUser['name'] = $a->user['username'];
        } elseif (!local_user() && remote_user()) {
-               $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
+               $remoteUser = Contact::getById(remote_user(), $fields);
                $nav['remote'] = DI::l10n()->t('Guest');
        } elseif (Model\Profile::getMyURL()) {
-               $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
-                               WHERE `addr` = '%s' AND `network` = 'dfrn'",
-                       DBA::escape($webbie));
+               $remoteUser = Contact::getByURL($homelink, null, $fields);
                $nav['remote'] = DI::l10n()->t('Visitor');
        } else {
-               $r = false;
+               $remoteUser = null;
        }
 
-       $remoteUser = null;
-       if (DBA::isResult($r)) {
+       if (DBA::isResult($remoteUser)) {
                $nav['userinfo'] = [
-                       'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
-                       'name' => $r[0]['name'],
+                       'icon' => Contact::getMicro($remoteUser),
+                       'name' => $remoteUser['name'],
                ];
-               $remoteUser = $r[0];
+               $server_url = $remoteUser['baseurl'];
        }
 
        if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {