Merge pull request #5259 from rabuzarus/20180616_-_magic_auth_test_2

[friendica.git] / mod / nogroup.php

diff --git a/mod/nogroup.php b/mod/nogroup.php
index 72cf0373046957da0e504b25757b6cafe63e13a2..75781765e05b7e4dd785313e34b77ff169baa9d2 100644 (file)
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -3,21 +3,18 @@
  * @file mod/nogroup.php
  */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 
-require_once 'include/contact_selectors.php';
-
 function nogroup_init(App $a)
 {
        if (! local_user()) {
                return;
        }
 
-       require_once 'include/group.php';
-       require_once 'include/contact_widgets.php';
-
        if (! x($a->page, 'aside')) {
                $a->page['aside'] = '';
        }
@@ -28,7 +25,7 @@ function nogroup_init(App $a)
 function nogroup_content(App $a)
 {
        if (! local_user()) {
-               notice(t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.') . EOL);
                return '';
        }
 
@@ -41,34 +38,31 @@ function nogroup_content(App $a)
                foreach ($r as $rr) {
                        $contact_details = Contact::getDetailsByURL($rr['url'], local_user(), $rr);
 
-                       $contacts[] = array(
-                               'img_hover' => sprintf(t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
-                               'edit_hover' => t('Edit contact'),
+                       $contacts[] = [
+                               'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
+                               'edit_hover' => L10n::t('Edit contact'),
                                'photo_menu' => Contact::photoMenu($rr),
                                'id' => $rr['id'],
-                               'alt_text' => $alt_text,
-                               'dir_icon' => $dir_icon,
                                'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
                                'name' => $contact_details['name'],
                                'username' => $contact_details['name'],
                                'details'       => $contact_details['location'],
                                'tags'          => $contact_details['keywords'],
                                'about'         => $contact_details['about'],
-                               'sparkle' => $sparkle,
                                'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
                                'url' => $rr['url'],
-                               'network' => network_to_name($rr['network'], $url),
-                       );
+                               'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
+                       ];
                }
        }
 
        $tpl = get_markup_template("nogroup-template.tpl");
-       $o .= replace_macros(
+       $o = replace_macros(
                $tpl,
-               array(
-               '$header' => t('Contacts who are not members of a group'),
+               [
+               '$header' => L10n::t('Contacts who are not members of a group'),
                '$contacts' => $contacts,
-               '$paginate' => paginate($a))
+               '$paginate' => paginate($a)]
        );
 
        return $o;