Merge branch 'develop' into rewrites/coding-convention-split2-1-2

[friendica.git] / mod / nogroup.php

diff --git a/mod/nogroup.php b/mod/nogroup.php
index 06fa730e0d1a581ef7f3c1a8df8d678da6a2e029..11b7bdc7aa486c0e512dee4782c159a97090fc24 100644 (file)
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -4,49 +4,51 @@ require_once('include/Contact.php');
 require_once('include/socgraph.php');
 require_once('include/contact_selectors.php');
 
-function nogroup_init(&$a) {
+function nogroup_init(App $a) {
 
-       if(! local_user())
+       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_side('contacts','group','extended',0,$contact_id);
 }
 
 
-function nogroup_content(&$a) {
+function nogroup_content(App $a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return '';
        }
 
        require_once('include/Contact.php');
        $r = contacts_not_grouped(local_user());
-       if(count($r)) {
+       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) {
+       if (dbm::is_result($r)) {
+               foreach ($r as $rr) {
 
-                       $contact_details = get_contact_details_by_url($rr['url'], local_user());
+                       $contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr);
 
                        $contacts[] = array(
-                               'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
+                               'img_hover' => sprintf(t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
                                'edit_hover' => t('Edit contact'),
                                'photo_menu' => contact_photo_menu($rr),
                                'id' => $rr['id'],
                                'alt_text' => $alt_text,
                                'dir_icon' => $dir_icon,
-                               'thumb' => $rr['thumb'],
-                               'name' => $rr['name'],
-                               'username' => $rr['name'],
+                               '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'],