X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnogroup.php;h=7ebb5bd1f2179852e57ace38dbfa0cbd764c92ed;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=c50ec486c2945670bec64fd0efab49f74f5376b8;hpb=ec02af593db87e78b0b388047ac4265aa5f987b1;p=friendica.git

diff --git a/mod/nogroup.php b/mod/nogroup.php
index c50ec486c2..7ebb5bd1f2 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -3,11 +3,10 @@
  * @file mod/nogroup.php
  */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
-
-require_once 'include/Contact.php';
-require_once 'include/contact_selectors.php';
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
 
 function nogroup_init(App $a)
 {
@@ -15,14 +14,13 @@ function nogroup_init(App $a)
 		return;
 	}
 
-	require_once 'include/group.php';
 	require_once 'include/contact_widgets.php';
 
 	if (! x($a->page, 'aside')) {
 		$a->page['aside'] = '';
 	}
 
-	$a->page['aside'] .= group_side('contacts', 'group', 'extended', 0, $contact_id);
+	$a->page['aside'] .= Group::sidebarWidget('contacts', 'group', 'extended');
 }
 
 function nogroup_content(App $a)
@@ -32,7 +30,6 @@ function nogroup_content(App $a)
 		return '';
 	}
 
-	require_once 'include/Contact.php';
 	$r = Contact::getUngroupedList(local_user());
 	if (DBM::is_result($r)) {
 		$a->set_pager_total($r[0]['total']);
@@ -43,28 +40,25 @@ function nogroup_content(App $a)
 			$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']),
+				'img_hover' => t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
 				'edit_hover' => 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' => $url,
-				'network' => network_to_name($rr['network'], $url),
+				'url' => $rr['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'),