Merge pull request #3991 from MrPetovan/bug/undefined-variables

[friendica.git] / mod / nogroup.php

diff --git a/mod/nogroup.php b/mod/nogroup.php
index e212b30dc16265bd4d00db73c9ba4511d23db0c9..5fb9afc2ac48c77e1a2d5135994e597ddc326cc9 100644 (file)
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -4,8 +4,8 @@
  */
 use Friendica\App;
 use Friendica\Database\DBM;
+use Friendica\Object\Contact;
 
-require_once 'include/Contact.php';
 require_once 'include/contact_selectors.php';
 
 function nogroup_init(App $a)
@@ -31,20 +31,19 @@ function nogroup_content(App $a)
                return '';
        }
 
-       require_once 'include/Contact.php';
-       $r = contacts_not_grouped(local_user());
+       $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']);
+       $r = Contact::getUngroupedList(local_user(), $a->pager['start'], $a->pager['itemspage']);
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
-                       $contact_details = get_contact_details_by_url($rr['url'], local_user(), $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'),
-                               'photo_menu' => contact_photo_menu($rr),
+                               'photo_menu' => Contact::photoMenu($rr),
                                'id' => $rr['id'],
                                'alt_text' => $alt_text,
                                'dir_icon' => $dir_icon,
@@ -56,7 +55,7 @@ function nogroup_content(App $a)
                                'about'         => $contact_details['about'],
                                'sparkle' => $sparkle,
                                'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
-                               'url' => $url,
+                               'url' => $rr['url'],
                                'network' => network_to_name($rr['network'], $url),
                        );
                }