Some more avatar function replacements

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 2afc90dbf1389822b8ba244442e3068e205bdb82..eb1dbdb0437ac8f52e3f26646adff4da980bddc6 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -20,7 +20,6 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
@@ -29,9 +28,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -41,13 +38,12 @@ use Friendica\Model\Post\Category;
 use Friendica\Model\Profile;
 use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 function network_init(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -305,7 +301,7 @@ function network_content(App $a, $update = 0, $parent = 0)
        }
 
        if ($o === '') {
-               notice("No items found");
+               notice(DI::l10n()->t("No items found"));
        }
 
        return $o;
@@ -548,7 +544,7 @@ function networkThreadedView(App $a, $update, $parent)
                        if ($update) {
                                exit();
                        }
-                       notice(DI::l10n()->t('No such group') . EOL);
+                       notice(DI::l10n()->t('No such group'));
                        DI::baseUrl()->redirect('network/0');
                        // NOTREACHED
                }
@@ -576,7 +572,7 @@ function networkThreadedView(App $a, $update, $parent)
                        '$title' => DI::l10n()->t('Group: %s', $group['name'])
                ]) . $o;
        } elseif ($cid) {
-               $fields = ['id', 'name', 'network', 'writable', 'nurl',
+               $fields = ['id', 'name', 'network', 'writable', 'nurl', 'avatar',
                        'forum', 'prv', 'contact-type', 'addr', 'thumb', 'location'];
                $condition = ["`id` = ? AND (NOT `blocked` OR `pending`)", $cid];
                $contact = DBA::selectFirst('contact', $fields, $condition);
@@ -587,7 +583,7 @@ function networkThreadedView(App $a, $update, $parent)
                                'id' => 'network',
                                'name' => $contact['name'],
                                'itemurl' => ($contact['addr'] ?? '') ?: $contact['nurl'],
-                               'thumb' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
+                               'thumb' => Contact::getThumb($contact),
                                'details' => $contact['location'],
                        ];
 
@@ -598,7 +594,7 @@ function networkThreadedView(App $a, $update, $parent)
                                'id' => 'network',
                        ]) . $o;
                } else {
-                       notice(DI::l10n()->t('Invalid contact.') . EOL);
+                       notice(DI::l10n()->t('Invalid contact.'));
                        DI::baseUrl()->redirect('network');
                        // NOTREACHED
                }