X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=a35f0619beb9ecac212dc1255257175f048c1307;hb=e0b33b36a21d7803353692372d7ceb90683d8888;hp=fc3bdf0d689802a18df130f6eb59b5902df95df5;hpb=3dac937f2298f5ddbd521115514a6974cde505cd;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index fc3bdf0d68..a35f0619be 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -9,6 +9,7 @@ use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -24,7 +25,6 @@ use Friendica\Util\DateTimeFormat;
 
 require_once 'include/conversation.php';
 require_once 'include/items.php';
-require_once 'include/acl_selectors.php';
 
 function network_init(App $a)
 {
@@ -345,7 +345,7 @@ function networkConversation($a, $items, $mode, $update, $ordering = '')
 	// 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, $ordering);
+	$o = conversation($a, $items, $mode, $update, false, $ordering);
 
 	if (!$update) {
 		if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
@@ -358,7 +358,7 @@ function networkConversation($a, $items, $mode, $update, $ordering = '')
 	return $o;
 }
 
-function network_content(App $a, $update = 0)
+function network_content(App $a, $update = 0, $parent = 0)
 {
 	if (!local_user()) {
 		return Login::form();
@@ -385,7 +385,7 @@ function network_content(App $a, $update = 0)
 	if ($nouveau) {
 		$o = networkFlatView($a, $update);
 	} else {
-		$o = networkThreadedView($a, $update);
+		$o = networkThreadedView($a, $update, $parent);
 	}
 
 	return $o;
@@ -427,8 +427,8 @@ function networkFlatView(App $a, $update = 0)
 			'lockstate' => (((is_array($a->user) &&
 			((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
 			(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'default_perms' => get_acl_permissions($a->user),
-			'acl' => populate_acl($a->user, true),
+			'default_perms' => ACL::getDefaultUserPermissions($a->user),
+			'acl' => ACL::getFullSelectorHTML($a->user, true),
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
@@ -439,7 +439,7 @@ function networkFlatView(App $a, $update = 0)
 
 		if (!Config::get('theme', 'hide_eventlist')) {
 			$o .= Profile::getBirthdays();
-			$o .= Profile::getEvents();
+			$o .= Profile::getEventsReminderHTML();
 		}
 	}
 
@@ -476,7 +476,7 @@ function networkFlatView(App $a, $update = 0)
  * @param integer $update Used for the automatic reloading
  * @return string HTML of the network content in flat view
  */
-function networkThreadedView(App $a, $update = 0)
+function networkThreadedView(App $a, $update, $parent)
 {
 	// Rawmode is used for fetching new content at the end of the page
 	$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
@@ -576,8 +576,8 @@ function networkThreadedView(App $a, $update = 0)
 			'lockstate' => ((($gid) || ($cid) || ($nets) || (is_array($a->user) &&
 			((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
 			(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'default_perms' => get_acl_permissions($a->user),
-			'acl' => populate_acl((($gid || $cid || $nets) ? $def_acl : $a->user), true),
+			'default_perms' => ACL::getDefaultUserPermissions($a->user),
+			'acl' => ACL::getFullSelectorHTML((($gid || $cid || $nets) ? $def_acl : $a->user), true),
 			'bang' => (($gid || $cid || $nets) ? '!' : ''),
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
@@ -677,7 +677,7 @@ function networkThreadedView(App $a, $update = 0)
 
 	if (!$gid && !$cid && !$update && !Config::get('theme', 'hide_eventlist')) {
 		$o .= Profile::getBirthdays();
-		$o .= Profile::getEvents();
+		$o .= Profile::getEventsReminderHTML();
 	}
 
 	if ($datequery) {
@@ -689,9 +689,6 @@ function networkThreadedView(App $a, $update = 0)
 				dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
 	}
 
-	$sql_order = '';
-	$order_mode = 'received';
-
 	if ($conv) {
 		$sql_extra3 .= " AND $sql_table.`mention`";
 	}
@@ -699,14 +696,10 @@ function networkThreadedView(App $a, $update = 0)
 	// Normal conversation view
 	if ($order === 'post') {
 		$ordering = '`created`';
-		if ($sql_order == '') {
-			$order_mode = 'created';
-		}
+		$order_mode = 'created';
 	} else {
 		$ordering = '`commented`';
-		if ($sql_order == '') {
-			$order_mode = 'commented';
-		}
+		$order_mode = 'commented';
 	}
 
 	if ($sql_order == '') {
@@ -759,19 +752,34 @@ function networkThreadedView(App $a, $update = 0)
 
 	// Fetch a page full of parent items for this page
 	if ($update) {
-		if (Config::get('system', 'like_no_comment')) {
-			$sql_extra4 = " AND `item`.`verb` = '" . ACTIVITY_POST . "'";
+		if (!empty($parent)) {
+			// Load only a single thread
+			$sql_extra4 = "`item`.`id` = ".intval($parent);
 		} else {
-			$sql_extra4 = '';
+			// Load all unseen items
+			$sql_extra4 = "`item`.`unseen`";
+			if (Config::get("system", "like_no_comment")) {
+				$sql_extra4 .= " AND `item`.`verb` = '".ACTIVITY_POST."'";
+			}
+			if ($order === 'post') {
+				// Only show toplevel posts when updating posts in this order mode
+				$sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
+			}
 		}
-		$r = q("SELECT `item`.`uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date`
+
+		$r = q("SELECT `item`.`parent-uri` AS `uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date`
 			FROM `item` $sql_post_table
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-			WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
-			AND NOT `item`.`moderated` AND `item`.`unseen`
+				AND (`item`.`parent-uri` != `item`.`uri`
+					OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
+					OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
+			WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
+			AND NOT `item`.`moderated` AND $sql_extra4
 			$sql_extra3 $sql_extra $sql_range $sql_nets
 			ORDER BY `order_date` DESC LIMIT 100",
+			intval(CONTACT_IS_SHARING),
+			intval(CONTACT_IS_FRIEND),
 			intval(local_user())
 		);
 	} else {
@@ -780,10 +788,15 @@ function networkThreadedView(App $a, $update = 0)
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
 				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+				AND (`item`.`parent-uri` != `item`.`uri`
+					OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
+					OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
 			WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
 			AND NOT `thread`.`moderated`
 			$sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets
 			ORDER BY `order_date` DESC $pager_sql",
+			intval(CONTACT_IS_SHARING),
+			intval(CONTACT_IS_FRIEND),
 			intval(local_user())
 		);
 	}
@@ -819,14 +832,19 @@ function networkThreadedView(App $a, $update = 0)
 			$top_limit = DateTimeFormat::utcNow();
 		}
 
-		$items = dba::p("SELECT `item`.`uri`, `item`.`id` AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
+		$items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
 			STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
 				(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
 			ON `item`.`id` = `term`.`oid`
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
+				AND (`item`.`parent-uri` != `item`.`uri`
+					OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
+					OR `contact`.`rel` IN (?, ?) AND NOT `contact`.`readonly`)
 			WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?
 				AND NOT `contact`.`hidden` AND NOT `contact`.`blocked`" . $sql_tag_nets,
-			local_user(), TERM_OBJ_POST, TERM_HASHTAG, $top_limit, $bottom_limit);
+			local_user(), TERM_OBJ_POST, TERM_HASHTAG,
+			CONTACT_IS_SHARING, CONTACT_IS_FRIEND,
+			$top_limit, $bottom_limit);
 
 		$data = dba::inArray($items);
 
@@ -857,20 +875,18 @@ function networkThreadedView(App $a, $update = 0)
 		$parents_arr = [];
 
 		foreach ($items as $item) {
-			if (!in_array($item['item_id'], $parents_arr)) {
+			if ($date_offset < $item['order_date']) {
+				$date_offset = $item['order_date'];
+			}
+			if (!in_array($item['item_id'], $parents_arr) && ($item['item_id'] > 0)) {
 				$parents_arr[] = $item['item_id'];
 			}
 		}
-
 		$parents_str = implode(', ', $parents_arr);
 	}
 
 	if (x($_GET, 'offset')) {
 		$date_offset = $_GET['offset'];
-	} elseif (count($items)) {
-		$date_offset = $items[0][$order_mode];
-	} else {
-		$date_offset = '';
 	}
 
 	$a->page_offset = $date_offset;