Merge pull request #5238 from annando/more-abstraction

[friendica.git] / mod / nogroup.php

diff --git a/mod/nogroup.php b/mod/nogroup.php
index 885ba62c6301e4358d3b027c093bf09892f62981..75781765e05b7e4dd785313e34b77ff169baa9d2 100644 (file)
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -1,72 +1,69 @@
 <?php
-
-require_once('include/Contact.php');
-require_once('include/socgraph.php');
-require_once('include/contact_selectors.php');
-
-function nogroup_init(&$a) {
-
-       if(! local_user())
+/**
+ * @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;
+
+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'))
+       if (! x($a->page, 'aside')) {
                $a->page['aside'] = '';
+       }
 
-       $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
+       $a->page['aside'] .= Group::sidebarWidget('contacts', 'group', 'extended');
 }
 
-
-function nogroup_content(&$a) {
-
-       if(! local_user()) {
-               notice( t('Permission denied.') . EOL);
+function nogroup_content(App $a)
+{
+       if (! local_user()) {
+               notice(L10n::t('Permission denied.') . EOL);
                return '';
        }
 
-       require_once('include/Contact.php');
-       $r = contacts_not_grouped(local_user());
-       if(count($r)) {
+       $r = Contact::getUngroupedList(local_user());
+       if (DBM::is_result($r)) {
                $a->set_pager_total($r[0]['total']);
        }
-       $r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
-       if(count($r)) {
-               foreach($r as $rr) {
-
-
-                       $contacts[] = array(
-                               'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
-                               'edit_hover' => t('Edit contact'),
-                               'photo_menu' => contact_photo_menu($rr),
+       $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'],
-                               'alt_text' => $alt_text,
-                               'dir_icon' => $dir_icon,
-                               'thumb' => $rr['thumb'], 
-                               'name' => $rr['name'],
-                               'username' => $rr['name'],
-                               'sparkle' => $sparkle,
-                               'itemurl' => $rr['url'],
-                               'url' => $url,
-                               'network' => network_to_name($rr['network']),
-                       );
+                               '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");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
+       $o = replace_macros(
+               $tpl,
+               [
+               '$header' => L10n::t('Contacts who are not members of a group'),
+               '$contacts' => $contacts,
+               '$paginate' => paginate($a)]
        );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
 
-       $o .= replace_macros($tpl,$includes + array(
-               '$header' => t('Contacts who are not members of a group'),
-               '$contacts' => $contacts,
-               '$paginate' => paginate($a),
-       )); 
-       
        return $o;
-
 }