X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnogroup.php;h=a66a70a1e0cef670d1c3e5ccb425518712bbef18;hb=09667dd82bbb9bb23a4ad8d86c1e9f3146665aa5;hp=9f6e9784331851b702434245f24256313612d6e4;hpb=dfa5183774e24fe2b1a355c9427372d4cd55ea70;p=friendica.git

diff --git a/mod/nogroup.php b/mod/nogroup.php
index 9f6e978433..a66a70a1e0 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -1,52 +1,55 @@
 <?php
+/**
+ * @file mod/nogroup.php
+ */
+use Friendica\App;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
 
-require_once('include/Contact.php');
-require_once('include/socgraph.php');
-require_once('include/contact_selectors.php');
+require_once 'include/contact_selectors.php';
 
-function nogroup_init(&$a) {
-
-	if(! local_user())
+function nogroup_init(App $a)
+{
+	if (! local_user()) {
 		return;
+	}
 
-	require_once('include/group.php');
-	require_once('include/contact_widgets.php');
+	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','extended',0,$contact_id);
+	$a->page['aside'] .= group_side('contacts', 'group', 'extended', 0, $contact_id);
 }
 
-
-function nogroup_content(&$a) {
-
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
+function nogroup_content(App $a)
+{
+	if (! local_user()) {
+		notice(t('Permission denied.') . EOL);
 		return '';
 	}
 
-	require_once('include/Contact.php');
-	$r = contacts_not_grouped(local_user());
-	if(count($r)) {
+	$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']);
-	if(count($r)) {
-		foreach($r as $rr) {
-
-			$contact_details = get_contact_details_by_url($rr['url'], local_user());
+	$r = Contact::getUngroupedList(local_user(), $a->pager['start'], $a->pager['itemspage']);
+	if (DBM::is_result($r)) {
+		foreach ($r as $rr) {
+			$contact_details = Contact::getDetailsByURL($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),
+				'photo_menu' => Contact::photoMenu($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'],
@@ -59,12 +62,13 @@ function nogroup_content(&$a) {
 	}
 
 	$tpl = get_markup_template("nogroup-template.tpl");
-	$o .= replace_macros($tpl, array(
+	$o .= replace_macros(
+		$tpl,
+		array(
 		'$header' => t('Contacts who are not members of a group'),
 		'$contacts' => $contacts,
-		'$paginate' => paginate($a),
-	));
+		'$paginate' => paginate($a))
+	);
 
 	return $o;
-
 }