X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=81e6754c235595faaef302d12030794c4d463559;hb=93ca0d79fe3f68e2b9942b1c251475065add2f81;hp=7e61d083f68d8e87f338ce7ac323dc8b2bca19d8;hpb=7499824381b3cb4a90f0d126e3eaeb4b3b786cc4;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 7e61d083f6..81e6754c23 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -9,10 +9,10 @@ use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
 
 require_once 'include/conversation.php';
-require_once 'include/group.php';
 require_once 'include/contact_widgets.php';
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
@@ -157,7 +157,7 @@ function network_init(App $a) {
 		$a->page['aside'] = '';
 	}
 
-	$a->page['aside'] .= (Feature::isEnabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
+	$a->page['aside'] .= (Feature::isEnabled(local_user(),'groups') ? Group::sidebarWidget('network/0','network','standard',$group_id) : '');
 	$a->page['aside'] .= (Feature::isEnabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : '');
 	$a->page['aside'] .= posted_date_widget('network',local_user(),false);
 	$a->page['aside'] .= networks_widget('network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
@@ -365,7 +365,7 @@ function networkConversation($a, $items, $mode, $update) {
 	// Set this so that the conversation function can find out contact info for our wall-wall items
 	$a->page_contact = $a->contact;
 
-	$o .= conversation($a, $items, $mode, $update);
+	$o = conversation($a, $items, $mode, $update);
 
 	if (!$update) {
 		if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
@@ -567,10 +567,10 @@ function networkThreadedView(App $a, $update = 0) {
 		$o .= $tabs;
 
 		if ($group) {
-			if (($t = group_public_members($group)) && !PConfig::get(local_user(),'system','nowarn_insecure')) {
-				notice(sprintf(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
+			if (($t = Contact::getOStatusCountByGroupId($group)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) {
+				notice(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
 						"Warning: This group contains %s members from a network that doesn't allow non public messages.",
-						$t), $t).EOL);
+						$t) . EOL);
 				notice(t("Messages in this group won't be send to these receivers.").EOL);
 			}
 		}
@@ -644,7 +644,7 @@ function networkThreadedView(App $a, $update = 0) {
 			// NOTREACHED
 		}
 
-		$contacts = expand_groups(array($group));
+		$contacts = Group::expand(array($group));
 
 		if ((is_array($contacts)) && count($contacts)) {
 			$contact_str_self = "";
@@ -664,7 +664,7 @@ function networkThreadedView(App $a, $update = 0) {
 		}
 
 		$o = replace_macros(get_markup_template("section_title.tpl"),array(
-			'$title' => sprintf(t('Group: %s'), $r['name'])
+			'$title' => t('Group: %s', $r['name'])
 		)) . $o;
 
 	} elseif ($cid) {
@@ -716,13 +716,6 @@ function networkThreadedView(App $a, $update = 0) {
 	$sql_order = "";
 	$order_mode = "received";
 
-	if (strlen($file)) {
-		$sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-				dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user()));
-		$sql_order = "`item`.`id`";
-		$order_mode = "id";
-	}
-
 	if ($conv) {
 		$sql_extra3 .= " AND $sql_table.`mention`";
 	}
@@ -744,7 +737,7 @@ function networkThreadedView(App $a, $update = 0) {
 		$sql_order = "$sql_table.$ordering";
 	}
 
-	if (($_GET["offset"] != "")) {
+	if (x($_GET, 'offset')) {
 		$sql_extra3 .= sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"]));
 	}
 
@@ -816,9 +809,10 @@ function networkThreadedView(App $a, $update = 0) {
 	$parents_str = '';
 	$date_offset = "";
 
+	$items = array();
 	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
-			if (!in_array($rr['item_id'],$parents_arr)) {
+			if (!in_array($rr['item_id'], $parents_arr)) {
 				$parents_arr[] = $rr['item_id'];
 			}
 		}
@@ -833,12 +827,10 @@ function networkThreadedView(App $a, $update = 0) {
 			$max_comments = 100;
 		}
 
-		$items = array();
-
 		foreach ($parents_arr AS $parents) {
-			$thread_items = dba::p(item_query()." AND `item`.`uid` = ?
+			$thread_items = dba::p(item_query() . " AND `item`.`uid` = ?
 				AND `item`.`parent` = ?
-				ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+				ORDER BY `item`.`commented` DESC LIMIT " . intval($max_comments + 1),
 				local_user(),
 				$parents
 			);
@@ -847,15 +839,15 @@ function networkThreadedView(App $a, $update = 0) {
 				$items = array_merge($items, dba::inArray($thread_items));
 			}
 		}
-		$items = conv_sort($items,$ordering);
-	} else {
-		$items = array();
+		$items = conv_sort($items, $ordering);
 	}
 
-	if ($_GET["offset"] == "") {
+	if (x($_GET, 'offset')) {
+		$date_offset = $_GET["offset"];
+	} elseif(count($items)) {
 		$date_offset = $items[0][$order_mode];
 	} else {
-		$date_offset = $_GET["offset"];
+		$date_offset = '';
 	}
 
 	$a->page_offset = $date_offset;