X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnogroup.php;h=570164dce7b40035abe7c898777ba146fd6810d4;hb=b10ae510c0911bf47e8a83fd47a2b9ffdb06c42a;hp=75781765e05b7e4dd785313e34b77ff169baa9d2;hpb=30c1cc0e8cec5438fd8fe36bd4ea00991dc01934;p=friendica.git diff --git a/mod/nogroup.php b/mod/nogroup.php index 75781765e0..570164dce7 100644 --- a/mod/nogroup.php +++ b/mod/nogroup.php @@ -8,18 +8,13 @@ use Friendica\Core\L10n; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Group; +use Friendica\Core\System; function nogroup_init(App $a) { if (! local_user()) { return; } - - if (! x($a->page, 'aside')) { - $a->page['aside'] = ''; - } - - $a->page['aside'] .= Group::sidebarWidget('contacts', 'group', 'extended'); } function nogroup_content(App $a) @@ -29,41 +24,5 @@ function nogroup_content(App $a) return ''; } - $r = Contact::getUngroupedList(local_user()); - if (DBM::is_result($r)) { - $a->set_pager_total($r[0]['total']); - } - $r = Contact::getUngroupedList(local_user(), $a->pager['start'], $a->pager['itemspage']); - if (DBM::is_result($r)) { - foreach ($r as $rr) { - $contact_details = Contact::getDetailsByURL($rr['url'], local_user(), $rr); - - $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'], - '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'], - 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), - 'url' => $rr['url'], - 'network' => ContactSelector::networkToName($rr['network'], $rr['url']), - ]; - } - } - - $tpl = get_markup_template("nogroup-template.tpl"); - $o = replace_macros( - $tpl, - [ - '$header' => L10n::t('Contacts who are not members of a group'), - '$contacts' => $contacts, - '$paginate' => paginate($a)] - ); - - return $o; + goaway(System::baseUrl() . '/group/none'); }