X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnogroup.php;h=570164dce7b40035abe7c898777ba146fd6810d4;hb=303aef34f0804f9becc10610ae85985835f9d9bf;hp=5fb9afc2ac48c77e1a2d5135994e597ddc326cc9;hpb=0dce57d4007d7e3cff578825f212a7c0a6cb8800;p=friendica.git

diff --git a/mod/nogroup.php b/mod/nogroup.php
index 5fb9afc2ac..570164dce7 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -3,72 +3,26 @@
  * @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_selectors.php';
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Core\System;
 
 function nogroup_init(App $a)
 {
 	if (! local_user()) {
 		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);
 }
 
 function nogroup_content(App $a)
 {
 	if (! local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return '';
 	}
 
-	$r = Contact::getUngroupedList(local_user());
-	if (DBM::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
-	}
-	$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]'), $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' => $rr['url'],
-				'network' => network_to_name($rr['network'], $url),
-			);
-		}
-	}
-
-	$tpl = get_markup_template("nogroup-template.tpl");
-	$o .= replace_macros(
-		$tpl,
-		array(
-		'$header' => t('Contacts who are not members of a group'),
-		'$contacts' => $contacts,
-		'$paginate' => paginate($a))
-	);
-
-	return $o;
+	goaway(System::baseUrl() . '/group/none');
 }