X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnogroup.php;h=75781765e05b7e4dd785313e34b77ff169baa9d2;hb=62a61a95d3e1357a64b157136490c82aa4495d3e;hp=d88722e3f8244494767caaa309991667256d1b3b;hpb=b92fc24ff06681f445edff0d45f8f81a7e25ebe6;p=friendica.git

diff --git a/mod/nogroup.php b/mod/nogroup.php
index d88722e3f8..75781765e0 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -3,11 +3,11 @@
  * @file mod/nogroup.php
  */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Core\L10n;
 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,61 +15,54 @@ 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)
 {
 	if (! local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		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),
+			$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' => 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'),
+		[
+		'$header' => L10n::t('Contacts who are not members of a group'),
 		'$contacts' => $contacts,
-		'$paginate' => paginate($a))
+		'$paginate' => paginate($a)]
 	);
 
 	return $o;