X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnogroup.php;h=c75b595c363967f6fbfe0324117b288818e31415;hb=51155d7716da454d74366be3aec557eb7117e308;hp=885ba62c6301e4358d3b027c093bf09892f62981;hpb=1d6dd1666f4fc5da64447a48e158f8755d1d2a1b;p=friendica.git

diff --git a/mod/nogroup.php b/mod/nogroup.php
index 885ba62c63..c75b595c36 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -6,67 +6,67 @@ require_once('include/contact_selectors.php');
 
 function nogroup_init(&$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) {
 
-	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(), $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'],
 				'sparkle' => $sparkle,
-				'itemurl' => $rr['url'],
+				'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
 				'url' => $url,
-				'network' => network_to_name($rr['network']),
+				'network' => network_to_name($rr['network'], $url),
 			);
 		}
 	}
 
 	$tpl = get_markup_template("nogroup-template.tpl");
-
-	$includes = array(
-		'$contact_template' => 'contact_template.tpl',
-	);
-	$includes = set_template_includes($a->theme['template_engine'], $includes);
-
-	$o .= replace_macros($tpl,$includes + array(
+	$o .= replace_macros($tpl, array(
 		'$header' => t('Contacts who are not members of a group'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
-	)); 
-	
+	));
+
 	return $o;
 
 }