X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=c2cb8e03fc848db9379114e949027546b1968a1b;hb=bf0b98017decf73123891e935993f2921d3b0acf;hp=8cebe731758d47ae389b72a301f5e39bbd68ea94;hpb=b007823bcaa81649e471acaa8c48b4c93cd89810;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 8cebe73175..c2cb8e03fc 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,43 +1,52 @@
 <?php
+
 /**
  * @file mod/network.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
-use Friendica\Core\System;
+use Friendica\Content\Nav;
+use Friendica\Content\Widget;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
+use Friendica\Model\Profile;
 use Friendica\Module\Login;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/conversation.php';
-require_once 'include/contact_widgets.php';
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
 
-function network_init(App $a) {
+function network_init(App $a)
+{
 	if (!local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	$search = (x($_GET, 'search') ? escape_tags($_GET['search']) : '');
 
 	if (($search != '') && !empty($_GET['submit'])) {
-		goaway('search?search='.urlencode($search));
+		goaway('search?search=' . urlencode($search));
 	}
 
 	if (x($_GET, 'save')) {
-		$exists = dba::exists('search', array('uid' => local_user(), 'term' => $search));
+		$exists = dba::exists('search', ['uid' => local_user(), 'term' => $search]);
 		if (!$exists) {
-			dba::insert('search', array('uid' => local_user(), 'term' => $search));
+			dba::insert('search', ['uid' => local_user(), 'term' => $search]);
 		}
 	}
 	if (x($_GET, 'remove')) {
-		dba::delete('search', array('uid' => local_user(), 'term' => $search));
+		dba::delete('search', ['uid' => local_user(), 'term' => $search]);
 	}
 
 	$is_a_date_query = false;
@@ -51,8 +60,6 @@ function network_init(App $a) {
 		$group_id = 0;
 	}
 
-	PConfig::set(local_user(), 'network.view', 'group.selected', $group_id);
-
 	if ($a->argc > 1) {
 		for ($x = 1; $x < $a->argc; $x ++) {
 			if (is_a_date_arg($a->argv[$x])) {
@@ -63,30 +70,24 @@ function network_init(App $a) {
 	}
 
 	// convert query string to array. remove friendica args
-	$query_array = array();
-	$query_string = str_replace($a->cmd."?", "", $a->query_string);
+	$query_array = [];
+	$query_string = str_replace($a->cmd . '?', '', $a->query_string);
 	parse_str($query_string, $query_array);
 	array_shift($query_array);
 
 	// fetch last used network view and redirect if needed
 	if (!$is_a_date_query) {
+		$sel_nets = defaults($_GET, 'nets', false);
 		$sel_tabs = network_query_get_sel_tab($a);
-		$sel_nets = network_query_get_sel_net();
 		$sel_groups = network_query_get_sel_group($a);
-		$last_sel_tabs = PConfig::get(local_user(), 'network.view','tab.selected');
-		$last_sel_nets = PConfig::get(local_user(), 'network.view', 'net.selected');
-		$last_sel_groups = PConfig::get(local_user(), 'network.view', 'group.selected');
+		$last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
 
 		$remember_tab = ($sel_tabs[0] === 'active' && is_array($last_sel_tabs) && $last_sel_tabs[0] !== 'active');
-		$remember_net = ($sel_nets === false && $last_sel_nets && $last_sel_nets !== 'all');
-		$remember_group = ($sel_groups === false && $last_sel_groups && $last_sel_groups != 0);
 
 		$net_baseurl = '/network';
-		$net_args = array();
+		$net_args = [];
 
-		if ($remember_group) {
-			$net_baseurl .= '/' . $last_sel_groups; // Note that the group number must come before the "/new" tab selection
-		} elseif ($sel_groups !== false) {
+		if ($sel_groups !== false) {
 			$net_baseurl .= '/' . $sel_groups;
 		}
 
@@ -95,24 +96,24 @@ function network_init(App $a) {
 			// last selected tab is _not_ '/network?f=&order=comment'.
 			// and this isn't a date query
 
-			$tab_baseurls = array(
-				'',		//all
-				'',		//postord
-				'',		//conv
-				'/new',		//new
-				'',		//starred
-				'',		//bookmarked
-				'',		//spam
-			);
-			$tab_args = array(
-				'f=&order=comment',	//all
-				'f=&order=post',	//postord
-				'f=&conv=1',		//conv
-				'',			//new
-				'f=&star=1',		//starred
-				'f=&bmark=1',		//bookmarked
-				'f=&spam=1',		//spam
-			);
+			$tab_baseurls = [
+				'',     //all
+				'',     //postord
+				'',     //conv
+				'/new', //new
+				'',     //starred
+				'',     //bookmarked
+				'',     //spam
+			];
+			$tab_args = [
+				'f=&order=comment', //all
+				'f=&order=post',    //postord
+				'f=&conv=1',        //conv
+				'',                 //new
+				'f=&star=1',        //starred
+				'f=&bmark=1',       //bookmarked
+				'f=&spam=1',        //spam
+			];
 
 			$k = array_search('active', $last_sel_tabs);
 
@@ -120,29 +121,24 @@ function network_init(App $a) {
 				$net_baseurl .= $tab_baseurls[$k];
 
 				// parse out tab queries
-				$dest_qa = array();
+				$dest_qa = [];
 				$dest_qs = $tab_args[$k];
 				parse_str($dest_qs, $dest_qa);
 				$net_args = array_merge($net_args, $dest_qa);
 			} else {
 				$remember_tab = false;
 			}
-		} elseif ($sel_tabs[4] === 'active') {
-			// The '/new' tab is selected
-			$remember_group = false;
 		}
 
-		if ($remember_net) {
-			$net_args['nets'] = $last_sel_nets;
-		} elseif ($sel_nets!==false) {
+		if ($sel_nets !== false) {
 			$net_args['nets'] = $sel_nets;
 		}
 
-		if ($remember_tab || $remember_net || $remember_group) {
+		if ($remember_tab) {
 			$net_args = array_merge($query_array, $net_args);
 			$net_queries = build_querystring($net_args);
 
-			$redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
+			$redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl);
 
 			goaway(System::baseUrl() . $redir_url);
 		}
@@ -153,60 +149,60 @@ function network_init(App $a) {
 		unset($_GET['nets']);
 	}
 
-
 	if (!x($a->page, 'aside')) {
 		$a->page['aside'] = '';
 	}
 
-	$a->page['aside'] .= (Feature::isEnabled(local_user(),'groups') ? Group::sidebarWidget('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'] : ''));
+	$a->page['aside'] .= posted_date_widget('network', local_user(), false);
+	$a->page['aside'] .= Widget::networks('network', (x($_GET, 'nets') ? $_GET['nets'] : ''));
 	$a->page['aside'] .= saved_searches($search);
-	$a->page['aside'] .= fileas_widget('network',(x($_GET, 'file') ? $_GET['file'] : ''));
+	$a->page['aside'] .= Widget::fileAs('network', (x($_GET, 'file') ? $_GET['file'] : ''));
 }
 
-function saved_searches($search) {
-
-	if (!Feature::isEnabled(local_user(),'savedsearch')) {
+function saved_searches($search)
+{
+	if (!Feature::isEnabled(local_user(), 'savedsearch')) {
 		return '';
 	}
 
 	$a = get_app();
 
 	$srchurl = '/network?f='
-		. ((x($_GET,'cid'))   ? '&cid='   . $_GET['cid']   : '')
-		. ((x($_GET,'star'))  ? '&star='  . $_GET['star']  : '')
-		. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
-		. ((x($_GET,'conv'))  ? '&conv='  . $_GET['conv']  : '')
-		. ((x($_GET,'nets'))  ? '&nets='  . $_GET['nets']  : '')
-		. ((x($_GET,'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
-		. ((x($_GET,'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
-		. ((x($_GET,'file'))  ? '&file='  . $_GET['file']  : '');
+		. ((x($_GET, 'cid'))   ? '&cid='   . $_GET['cid']   : '')
+		. ((x($_GET, 'star'))  ? '&star='  . $_GET['star']  : '')
+		. ((x($_GET, 'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
+		. ((x($_GET, 'conv'))  ? '&conv='  . $_GET['conv']  : '')
+		. ((x($_GET, 'nets'))  ? '&nets='  . $_GET['nets']  : '')
+		. ((x($_GET, 'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
+		. ((x($_GET, 'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
+		. ((x($_GET, 'file'))  ? '&file='  . $_GET['file']  : '');
 	;
 
 	$o = '';
 
-	$terms = dba::select('search', array('id', 'term'), array('uid' => local_user()));
-	$saved = array();
+	$terms = dba::select('search', ['id', 'term'], ['uid' => local_user()]);
+	$saved = [];
 
 	while ($rr = dba::fetch($terms)) {
-		$saved[] = array(
+		$saved[] = [
 			'id'          => $rr['id'],
 			'term'        => $rr['term'],
 			'encodedterm' => urlencode($rr['term']),
-			'delete'      => t('Remove term'),
-			'selected'    => ($search==$rr['term']),
-		);
+			'delete'      => L10n::t('Remove term'),
+			'selected'    => ($search == $rr['term']),
+		];
 	}
 
-	$tpl = get_markup_template("saved_searches_aside.tpl");
-	$o = replace_macros($tpl, array(
-		'$title'     => t('Saved Searches'),
-		'$add'       => t('add'),
-		'$searchbox' => search($search,'netsearch-box',$srchurl,true),
+	$tpl = get_markup_template('saved_searches_aside.tpl');
+	$o = replace_macros($tpl, [
+		'$title'     => L10n::t('Saved Searches'),
+		'$add'       => L10n::t('add'),
+		'$searchbox' => search($search, 'netsearch-box', $srchurl, true),
 		'$saved'     => $saved,
-	));
+	]);
 
 	return $o;
 }
@@ -226,8 +222,9 @@ function saved_searches($search) {
  *
  * @return Array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
  */
-function network_query_get_sel_tab(App $a) {
-	$no_active='';
+function network_query_get_sel_tab(App $a)
+{
+	$no_active = '';
 	$starred_active = '';
 	$new_active = '';
 	$bookmarked_active = '';
@@ -236,62 +233,42 @@ function network_query_get_sel_tab(App $a) {
 	$spam_active = '';
 	$postord_active = '';
 
-	if (($a->argc > 1 && $a->argv[1] === 'new')
-		|| ($a->argc > 2 && $a->argv[2] === 'new')) {
-			$new_active = 'active';
+	if (($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) {
+		$new_active = 'active';
 	}
 
-	if (x($_GET,'star')) {
+	if (x($_GET, 'star')) {
 		$starred_active = 'active';
 	}
 
-	if (x($_GET,'bmark')) {
+	if (x($_GET, 'bmark')) {
 		$bookmarked_active = 'active';
 	}
 
-	if (x($_GET,'conv')) {
+	if (x($_GET, 'conv')) {
 		$conv_active = 'active';
 	}
 
-	if (x($_GET,'spam')) {
+	if (x($_GET, 'spam')) {
 		$spam_active = 'active';
 	}
 
-
-
-	if (($new_active == '')
-		&& ($starred_active == '')
-		&& ($bookmarked_active == '')
-		&& ($conv_active == '')
-		&& ($spam_active == '')) {
-			$no_active = 'active';
+	if (($new_active == '') && ($starred_active == '') && ($bookmarked_active == '') && ($conv_active == '') && ($spam_active == '')) {
+		$no_active = 'active';
 	}
 
-	if ($no_active=='active' && x($_GET,'order')) {
-		switch($_GET['order']){
-		 case 'post': $postord_active = 'active'; $no_active=''; break;
-		 case 'comment' : $all_active = 'active'; $no_active=''; break;
+	if ($no_active == 'active' && x($_GET, 'order')) {
+		switch($_GET['order']) {
+			case 'post'    : $postord_active = 'active'; $no_active=''; break;
+			case 'comment' : $all_active     = 'active'; $no_active=''; break;
 		}
 	}
 
-	return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
+	return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active];
 }
 
-/**
- * @brief Return selected network from query
- * @return string Name of the selected network
- */
-function network_query_get_sel_net() {
-	$network = false;
-
-	if (x($_GET,'nets')) {
-		$network = $_GET['nets'];
-	}
-
-	return $network;
-}
-
-function network_query_get_sel_group(App $a) {
+function network_query_get_sel_group(App $a)
+{
 	$group = false;
 
 	if ($a->argc >= 2 && is_numeric($a->argv[1])) {
@@ -308,20 +285,20 @@ function network_query_get_sel_group(App $a) {
  * @param integer $update Used for the automatic reloading
  * @return string SQL with the appropriate LIMIT clause
  */
-function networkPager($a, $update) {
+function networkPager($a, $update)
+{
 	if ($update) {
 		// only setup pagination on initial page view
 		return ' LIMIT 100';
-
 	}
 
 	//  check if we serve a mobile device and get the user settings
 	//  accordingly
 	if ($a->is_mobile) {
-		$itemspage_network = PConfig::get(local_user(),'system','itemspage_mobile_network');
+		$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network');
 		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
 	} else {
-		$itemspage_network = PConfig::get(local_user(),'system','itemspage_network');
+		$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network');
 		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
 	}
 
@@ -333,7 +310,7 @@ function networkPager($a, $update) {
 
 	$a->set_pager_itemspage($itemspage_network);
 
-	return sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+	return sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 }
 
 /**
@@ -341,7 +318,8 @@ function networkPager($a, $update) {
  *
  * @param array $condition The array with the SQL condition
  */
-function networkSetSeen($condition) {
+function networkSetSeen($condition)
+{
 	if (empty($condition)) {
 		return;
 	}
@@ -349,7 +327,7 @@ function networkSetSeen($condition) {
 	$unseen = dba::exists('item', $condition);
 
 	if ($unseen) {
-		$r = dba::update('item', array('unseen' => false), $condition);
+		$r = Item::update(['unseen' => false], $condition);
 	}
 }
 
@@ -362,11 +340,12 @@ function networkSetSeen($condition) {
  * @param integer $update Used for the automatic reloading
  * @return string HTML of the conversation
  */
-function networkConversation($a, $items, $mode, $update) {
+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);
+	$o = conversation($a, $items, $mode, $update, false, $ordering);
 
 	if (!$update) {
 		if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
@@ -379,14 +358,15 @@ function networkConversation($a, $items, $mode, $update) {
 	return $o;
 }
 
-function network_content(App $a, $update = 0) {
+function network_content(App $a, $update = 0, $parent = 0)
+{
 	if (!local_user()) {
 		return Login::form();
 	}
 
 	/// @TODO Is this really necessary? $a is already available to hooks
-	$arr = array('query' => $a->query_string);
-	call_hooks('network_content_init', $arr);
+	$arr = ['query' => $a->query_string];
+	Addon::callHooks('network_content_init', $arr);
 
 	$nouveau = false;
 
@@ -398,14 +378,14 @@ function network_content(App $a, $update = 0) {
 		}
 	}
 
-	if (x($_GET,'file')) {
+	if (x($_GET, 'file')) {
 		$nouveau = true;
 	}
 
 	if ($nouveau) {
 		$o = networkFlatView($a, $update);
 	} else {
-		$o = networkThreadedView($a, $update);
+		$o = networkThreadedView($a, $update, $parent);
 	}
 
 	return $o;
@@ -418,56 +398,54 @@ function network_content(App $a, $update = 0) {
  * @param integer $update Used for the automatic reloading
  * @return string HTML of the network content in flat view
  */
-function networkFlatView(App $a, $update = 0) {
-
+function networkFlatView(App $a, $update = 0)
+{
 	// Rawmode is used for fetching new content at the end of the page
-	$rawmode = (isset($_GET["mode"]) AND ($_GET["mode"] == "raw"));
+	$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
 
-	if (isset($_GET["last_id"])) {
-		$last_id = intval($_GET["last_id"]);
+	if (isset($_GET['last_id'])) {
+		$last_id = intval($_GET['last_id']);
 	} else {
 		$last_id = 0;
 	}
 
 	$o = '';
 
-	$file = ((x($_GET,'file')) ? $_GET['file'] : '');
-
-	PConfig::set(local_user(), 'network.view', 'net.selected', 'all');
+	$file = ((x($_GET, 'file')) ? $_GET['file'] : '');
 
 	if (!$update && !$rawmode) {
 		$tabs = network_tabs($a);
 		$o .= $tabs;
 
-		nav_set_selected('network');
+		Nav::setSelected('network');
 
-		$x = array(
+		$x = [
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'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),
-			'bang'	=> '',
+			'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),
+			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
 			'content' => '',
-		);
+		];
 
 		$o .= status_editor($a, $x);
 
-		if (!Config::get('theme','hide_eventlist')) {
-			$o .= get_birthdays();
-			$o .= get_events();
+		if (!Config::get('theme', 'hide_eventlist')) {
+			$o .= Profile::getBirthdays();
+			$o .= Profile::getEventsReminderHTML();
 		}
 	}
 
 	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_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()));
 	} else {
 		$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
 	}
@@ -482,7 +460,7 @@ function networkFlatView(App $a, $update = 0) {
 		intval($_SESSION['uid'])
 	);
 
-	$condition = array('unseen' => true, 'uid' => local_user());
+	$condition = ['unseen' => true, 'uid' => local_user()];
 	networkSetSeen($condition);
 
 	$mode = 'network-new';
@@ -498,16 +476,16 @@ 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"));
+	$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
 
-	if (isset($_GET["last_received"]) && isset($_GET["last_commented"]) && isset($_GET["last_created"]) && isset($_GET["last_id"])) {
-		$last_received = DBM::date($_GET["last_received"]);
-		$last_commented = DBM::date($_GET["last_commented"]);
-		$last_created = DBM::date($_GET["last_created"]);
-		$last_id = intval($_GET["last_id"]);
+	if (isset($_GET['last_received']) && isset($_GET['last_commented']) && isset($_GET['last_created']) && isset($_GET['last_id'])) {
+		$last_received = DBM::date($_GET['last_received']);
+		$last_commented = DBM::date($_GET['last_commented']);
+		$last_created = DBM::date($_GET['last_created']);
+		$last_id = intval($_GET['last_id']);
 	} else {
 		$last_received = '';
 		$last_commented = '';
@@ -517,7 +495,7 @@ function networkThreadedView(App $a, $update = 0) {
 
 	$datequery = $datequery2 = '';
 
-	$group = 0;
+	$gid = 0;
 
 	if ($a->argc > 1) {
 		for ($x = 1; $x < $a->argc; $x ++) {
@@ -529,83 +507,82 @@ function networkThreadedView(App $a, $update = 0) {
 					$_GET['order'] = 'post';
 				}
 			} elseif (intval($a->argv[$x])) {
-				$group = intval($a->argv[$x]);
-				$def_acl = array('allow_gid' => '<' . $group . '>');
+				$gid = intval($a->argv[$x]);
+				$def_acl = ['allow_gid' => '<' . $gid . '>'];
 			}
 		}
 	}
 
 	$o = '';
 
-	$cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0);
-	$star = ((x($_GET,'star')) ? intval($_GET['star']) : 0);
-	$bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0);
-	$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
-	$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
-	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
+	$cid   = intval(defaults($_GET, 'cid'  , 0));
+	$star  = intval(defaults($_GET, 'star' , 0));
+	$bmark = intval(defaults($_GET, 'bmark', 0));
+	$conv  = intval(defaults($_GET, 'conv' , 0));
+	$order = notags(defaults($_GET, 'order', 'comment'));
+	$nets  =        defaults($_GET, 'nets' , '');
 
 	if ($cid) {
-		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
+		$def_acl = ['allow_cid' => '<' . intval($cid) . '>'];
 	}
 
 	if ($nets) {
-		$r = dba::select('contact', array('id'), array('uid' => local_user(), 'network' => $nets), array('self' => false));
+		$r = dba::select('contact', ['id'], ['uid' => local_user(), 'network' => $nets], ['self' => false]);
 
 		$str = '';
 		while ($rr = dba::fetch($r)) {
 			$str .= '<' . $rr['id'] . '>';
 		}
 		if (strlen($str)) {
-			$def_acl = array('allow_cid' => $str);
+			$def_acl = ['allow_cid' => $str];
 		}
 	}
-	PConfig::set(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all'));
 
 	if (!$update && !$rawmode) {
 		$tabs = network_tabs($a);
 		$o .= $tabs;
 
-		if ($group) {
-			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.",
+		if ($gid) {
+			if (($t = Contact::getOStatusCountByGroupId($gid)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) {
+				notice(L10n::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) . EOL);
-				notice(t("Messages in this group won't be send to these receivers.").EOL);
+				notice(L10n::t("Messages in this group won't be send to these receivers.").EOL);
 			}
 		}
 
-		nav_set_selected('network');
+		Nav::setSelected('network');
 
-		$content = "";
+		$content = '';
 
 		if ($cid) {
 			// If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor
-			$condition = array("`id` = ? AND (`forum` OR `prv`)", $cid);
-			$contact = dba::select('contact', array('addr', 'nick'), $condition, array('limit' => 1));
+			$condition = ["`id` = ? AND (`forum` OR `prv`)", $cid];
+			$contact = dba::selectFirst('contact', ['addr', 'nick'], $condition);
 			if (DBM::is_result($contact)) {
-				if ($contact["addr"] != '') {
-					$content = "!".$contact["addr"];
+				if ($contact['addr'] != '') {
+					$content = '!' . $contact['addr'];
 				} else {
-					$content = "!".$contact["nick"]."+".$cid;
+					$content = '!' . $contact['nick'] . '+' . $cid;
 				}
 			}
 		}
 
-		$x = array(
+		$x = [
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate'=> ((($group) || ($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((($group || $cid || $nets) ? $def_acl : $a->user), true),
-			'bang'	=> (($group || $cid || $nets) ? '!' : ''),
+			'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),
+			'bang' => (($gid || $cid || $nets) ? '!' : ''),
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
 			'content' => $content,
-		);
+		];
 
 		$o .= status_editor($a, $x);
 	}
@@ -614,128 +591,123 @@ function networkThreadedView(App $a, $update = 0) {
 	// that belongs to you, hence you can see all of it. We will filter by group if
 	// desired.
 
-	$sql_post_table = "";
-	$sql_options  = (($star) ? " AND `thread`.`starred` " : '');
+	$sql_post_table = '';
+	$sql_options = (($star) ? " AND `thread`.`starred` " : '');
 	$sql_options .= (($bmark) ? " AND `thread`.`bookmark` " : '');
 	$sql_extra = $sql_options;
-	$sql_extra2 = "";
-	$sql_extra3 = "";
-	$sql_table = "`thread`";
-	$sql_parent = "`iid`";
+	$sql_extra2 = '';
+	$sql_extra3 = '';
+	$sql_table = '`thread`';
+	$sql_parent = '`iid`';
 
 	if ($update) {
-		$sql_table = "`item`";
-		$sql_parent = "`parent`";
+		$sql_table = '`item`';
+		$sql_parent = '`parent`';
 		$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
 	}
 
-	$sql_nets = (($nets) ? sprintf(" and $sql_table.`network` = '%s' ", dbesc($nets)) : '');
+	$sql_nets = (($nets) ? sprintf(" AND $sql_table.`network` = '%s' ", dbesc($nets)) : '');
+	$sql_tag_nets = (($nets) ? sprintf(" AND `item`.`network` = '%s' ", dbesc($nets)) : '');
 
-	if ($group) {
-		$r = dba::select('group', array('name'), array('id' => $group, 'uid' => $_SESSION['uid']), array('limit' => 1));
-		if (!DBM::is_result($r)) {
-			if ($update)
+	if ($gid) {
+		$group = dba::selectFirst('group', ['name'], ['id' => $gid, 'uid' => $_SESSION['uid']]);
+		if (!DBM::is_result($group)) {
+			if ($update) {
 				killme();
-			notice(t('No such group') . EOL);
+			}
+			notice(L10n::t('No such group') . EOL);
 			goaway('network/0');
 			// NOTREACHED
 		}
 
-		$contacts = Group::expand(array($group));
+		$contacts = Group::expand([$gid]);
 
 		if ((is_array($contacts)) && count($contacts)) {
-			$contact_str_self = "";
+			$contact_str_self = '';
 
-			$contact_str = implode(',',$contacts);
-			$self = dba::select('contact', array('id'), array('uid' => $_SESSION['uid'], 'self' => true), array('limit' => 1));
+			$contact_str = implode(',', $contacts);
+			$self = dba::selectFirst('contact', ['id'], ['uid' => $_SESSION['uid'], 'self' => true]);
 			if (DBM::is_result($self)) {
-				$contact_str_self = $self["id"];
+				$contact_str_self = $self['id'];
 			}
 
-			$sql_post_table .= " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent;
+			$sql_post_table .= " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = " . $sql_table . "." . $sql_parent;
 			$sql_extra3 .= " AND (`thread`.`contact-id` IN ($contact_str) ";
-			$sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))";
+			$sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '" . protect_sprintf('%<' . intval($gid) . '>%') . "' AND `temp1`.`private`))";
 		} else {
 			$sql_extra3 .= " AND false ";
-			info(t('Group is empty'));
+			info(L10n::t('Group is empty'));
 		}
 
-		$o = replace_macros(get_markup_template("section_title.tpl"),array(
-			'$title' => t('Group: %s', $r['name'])
-		)) . $o;
-
+		$o = replace_macros(get_markup_template('section_title.tpl'), [
+			'$title' => L10n::t('Group: %s', $group['name'])
+		]) . $o;
 	} elseif ($cid) {
-		$fields = array('id', 'name', 'network', 'writable', 'nurl',
-				'forum', 'prv', 'contact-type', 'addr', 'thumb', 'location');
-		$condition = array("`id` = ? AND (NOT `blocked` OR `pending`)", $cid);
-		$r = dba::select('contact', $fields, $condition, array('limit' => 1));
-		if (DBM::is_result($r)) {
-			$sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid);
-
-			$entries[0] = array(
+		$fields = ['id', 'name', 'network', 'writable', 'nurl',
+			'forum', 'prv', 'contact-type', 'addr', 'thumb', 'location'];
+		$condition = ["`id` = ? AND (NOT `blocked` OR `pending`)", $cid];
+		$contact = dba::selectFirst('contact', $fields, $condition);
+		if (DBM::is_result($contact)) {
+			$sql_extra = " AND " . $sql_table . ".`contact-id` = " . intval($cid);
+
+			$entries[0] = [
 				'id' => 'network',
-				'name' => htmlentities($r['name']),
-				'itemurl' => (($r['addr']) ? ($r['addr']) : ($r['nurl'])),
-				'thumb' => proxy_url($r['thumb'], false, PROXY_SIZE_THUMB),
-				'details' => $r['location'],
-			);
+				'name' => htmlentities($contact['name']),
+				'itemurl' => defaults($contact, 'addr', $contact['nurl']),
+				'thumb' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
+				'details' => $contact['location'],
+			];
 
-			$entries[0]["account_type"] = Contact::getAccountType($r);
+			$entries[0]['account_type'] = Contact::getAccountType($contact);
 
-			$o = replace_macros(get_markup_template("viewcontact_template.tpl"),array(
+			$o = replace_macros(get_markup_template('viewcontact_template.tpl'), [
 				'contacts' => $entries,
 				'id' => 'network',
-			)) . $o;
+			]) . $o;
 
-			if ($r['network'] === NETWORK_OSTATUS && $r['writable'] && !PConfig::get(local_user(),'system','nowarn_insecure')) {
-				notice(t('Private messages to this person are at risk of public disclosure.') . EOL);
+			if ($contact['network'] === NETWORK_OSTATUS && $contact['writable'] && !PConfig::get(local_user(),'system','nowarn_insecure')) {
+				notice(L10n::t('Private messages to this person are at risk of public disclosure.') . EOL);
 			}
-
 		} else {
-			notice(t('Invalid contact.') . EOL);
+			notice(L10n::t('Invalid contact.') . EOL);
 			goaway('network');
 			// NOTREACHED
 		}
 	}
 
-	if (!$group && !$cid && !$update && !Config::get('theme','hide_eventlist')) {
-		$o .= get_birthdays();
-		$o .= get_events();
+	if (!$gid && !$cid && !$update && !Config::get('theme', 'hide_eventlist')) {
+		$o .= Profile::getBirthdays();
+		$o .= Profile::getEventsReminderHTML();
 	}
 
 	if ($datequery) {
-		$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
+		$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created <= '%s' ",
+				dbesc(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
 	}
 	if ($datequery2) {
-		$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+		$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created >= '%s' ",
+				dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
 	}
 
-	$sql_order = "";
-	$order_mode = "received";
-
 	if ($conv) {
 		$sql_extra3 .= " AND $sql_table.`mention`";
 	}
 
 	// Normal conversation view
 	if ($order === 'post') {
-		$ordering = "`created`";
-		if ($sql_order == "") {
-			$order_mode = "created";
-		}
+		$ordering = '`created`';
+		$order_mode = 'created';
 	} else {
-		$ordering = "`commented`";
-		if ($sql_order == "") {
-			$order_mode = "commented";
-		}
+		$ordering = '`commented`';
+		$order_mode = 'commented';
 	}
 
-	if ($sql_order == "") {
+	if ($sql_order == '') {
 		$sql_order = "$sql_table.$ordering";
 	}
 
 	if (x($_GET, 'offset')) {
-		$sql_range = sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"]));
+		$sql_range = sprintf(" AND $sql_order <= '%s'", dbesc($_GET['offset']));
 	} else {
 		$sql_range = '';
 	}
@@ -750,7 +722,7 @@ function networkThreadedView(App $a, $update = 0) {
 				$last_date = $last_received;
 				$sql_range .= sprintf(" AND $sql_table.`received` < '%s'", dbesc($last_received));
 				$a->set_pager_page(1);
-				$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
 			break;
 		case 'commented':
@@ -758,7 +730,7 @@ function networkThreadedView(App $a, $update = 0) {
 				$last_date = $last_commented;
 				$sql_range .= sprintf(" AND $sql_table.`commented` < '%s'", dbesc($last_commented));
 				$a->set_pager_page(1);
-				$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
 			break;
 		case 'created':
@@ -766,119 +738,140 @@ function networkThreadedView(App $a, $update = 0) {
 				$last_date = $last_created;
 				$sql_range .= sprintf(" AND $sql_table.`created` < '%s'", dbesc($last_created));
 				$a->set_pager_page(1);
-				$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
 			break;
 		case 'id':
-			if (($last_id > 0) && ($sql_table == "`thread`")) {
+			if (($last_id > 0) && ($sql_table == '`thread`')) {
 				$sql_range .= sprintf(" AND $sql_table.`iid` < '%s'", dbesc($last_id));
 				$a->set_pager_page(1);
-				$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
 			break;
 	}
 
 	// 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`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date`
-			FROM $sql_table $sql_post_table INNER 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`
+
+		$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`
+			AND NOT `item`.`moderated` AND $sql_extra4
 			$sql_extra3 $sql_extra $sql_range $sql_nets
 			ORDER BY `order_date` DESC LIMIT 100",
 			intval(local_user())
 		);
 	} else {
-		$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date`
-			FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+		$r = q("SELECT `item`.`uri`, `thread`.`iid` AS `item_id`, $sql_order AS `order_date`
+			FROM `thread` $sql_post_table
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
 			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 $sql_order DESC $pager_sql",
+			ORDER BY `order_date` DESC $pager_sql",
 			intval(local_user())
 		);
 	}
 
 	// Only show it when unfiltered (no groups, no networks, ...)
-	if (Config::get('system', 'comment_public') && (count($r) > 0) && (strlen($sql_extra . $sql_extra2 . $sql_extra3 . $sql_extra4 . $sql_nets) == 0)) {
-		$top_limit = current($r)['order_date'];
-		$bottom_limit = end($r)['order_date'];
+	if (in_array($nets, ['', NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
+		if (DBM::is_result($r)) {
+			$top_limit = current($r)['order_date'];
+			$bottom_limit = end($r)['order_date'];
+			if (empty($_SESSION['network_last_top_limit']) || ($_SESSION['network_last_top_limit'] < $top_limit)) {
+				$_SESSION['network_last_top_limit'] = $top_limit;
+			}
+		} else {
+			$top_limit = $bottom_limit = DateTimeFormat::utcNow();
+		}
 
 		// When checking for updates we need to fetch from the newest date to the newest date before
-		if ($update && !empty($_SESSION['network_last_date']) && ($bottom_limit > $_SESSION['network_last_date'])) {
+		// Only do this, when the last stored date isn't too long ago (10 times the update interval)
+		$browser_update = PConfig::get(local_user(), 'system', 'update_interval', 40000) / 1000;
+
+		if (($browser_update > 0) && $update && !empty($_SESSION['network_last_date']) &&
+			(($bottom_limit < $_SESSION['network_last_date']) || ($top_limit == $bottom_limit)) &&
+			((time() - $_SESSION['network_last_date_timestamp']) < ($browser_update * 10))) {
 			$bottom_limit = $_SESSION['network_last_date'];
 		}
-		$_SESSION['network_last_date'] = $top_limit;
+		$_SESSION['network_last_date'] = defaults($_SESSION, 'network_last_top_limit', $top_limit);
+		$_SESSION['network_last_date_timestamp'] = time();
 
 		if ($last_date > $top_limit) {
 			$top_limit = $last_date;
+		} elseif ($a->pager['page'] == 1) {
+			// Highest possible top limit when we are on the first page
+			$top_limit = DateTimeFormat::utcNow();
 		}
 
-		$items = dba::p("SELECT `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` FROM `item`
-			INNER JOIN (SELECT `oid` FROM `term` WHERE `term` IN
+		$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`
-			INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?",
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
+			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);
+
 		$data = dba::inArray($items);
 
 		if (count($data) > 0) {
-			logger('Tagged items: '.count($data).' - '.$bottom_limit." - ".$top_limit.' - '.local_user()); //$last_date);
-			$r = array_merge($r, $data);
-		}
-	}
-
-	// Then fetch all the children of the parents that are on this page
-
-	$parents_arr = array();
-	$parents_str = '';
-	$date_offset = "";
+			$tag_top_limit = current($data)['order_date'];
+			if ($_SESSION['network_last_date'] < $tag_top_limit) {
+				$_SESSION['network_last_date'] = $tag_top_limit;
+			}
 
-	$items = array();
-	if (DBM::is_result($r)) {
-		foreach ($r as $rr) {
-			if (!in_array($rr['item_id'], $parents_arr)) {
-				$parents_arr[] = $rr['item_id'];
+			logger('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user().' - '.(int)$update);
+			$s = [];
+			foreach ($r as $item) {
+				$s[$item['uri']] = $item;
 			}
+			foreach ($data as $item) {
+				$s[$item['uri']] = $item;
+			}
+			$r = $s;
 		}
+	}
 
-		$parents_str = implode(", ", $parents_arr);
+	$parents_str = '';
+	$date_offset = '';
 
-		// splitted into separate queries to avoid the problem with very long threads
-		// so always the last X comments are loaded
-		// This problem can occur expecially with imported facebook posts
-		$max_comments = Config::get("system", "max_comments");
-		if ($max_comments == 0) {
-			$max_comments = 100;
-		}
+	$items = $r;
 
-		foreach ($parents_arr AS $parents) {
-			$thread_items = dba::p(item_query() . " AND `item`.`parent` = ?
-				ORDER BY `item`.`commented` DESC LIMIT " . intval($max_comments + 1),
-				$parents
-			);
+	if (DBM::is_result($items)) {
+		$parents_arr = [];
 
-			if (DBM::is_result($thread_items)) {
-				$items = array_merge($items, dba::inArray($thread_items));
+		foreach ($items as $item) {
+			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'];
 			}
 		}
-		$items = conv_sort($items, $ordering);
+		$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 = '';
+		$date_offset = $_GET['offset'];
 	}
 
 	$a->page_offset = $date_offset;
@@ -887,17 +880,17 @@ function networkThreadedView(App $a, $update = 0) {
 	// level which items you've seen and which you haven't. If you're looking
 	// at the top level network page just mark everything seen.
 
-	if (!$group && !$cid && !$star) {
-		$condition = array('unseen' => true, 'uid' => local_user());
+	if (!$gid && !$cid && !$star) {
+		$condition = ['unseen' => true, 'uid' => local_user()];
 		networkSetSeen($condition);
 	} elseif ($parents_str) {
-		$condition = array("`uid` = ? AND `unseen` AND `parent` IN (" . dbesc($parents_str) . ")", local_user());
+		$condition = ["`uid` = ? AND `unseen` AND `parent` IN (" . dbesc($parents_str) . ")", local_user()];
 		networkSetSeen($condition);
 	}
 
 
 	$mode = 'network';
-	$o .= networkConversation($a, $items, $mode, $update);
+	$o .= networkConversation($a, $items, $mode, $update, $ordering);
 
 	return $o;
 }
@@ -923,80 +916,82 @@ function network_tabs(App $a)
 	$cmd = $a->cmd;
 
 	// tabs
-	$tabs = array(
-		array(
-			'label'	=> t('Commented Order'),
+	$tabs = [
+		[
+			'label'	=> L10n::t('Commented Order'),
 			'url'	=> str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
 			'sel'	=> $all_active,
-			'title'	=> t('Sort by Comment Date'),
+			'title'	=> L10n::t('Sort by Comment Date'),
 			'id'	=> 'commented-order-tab',
-			'accesskey' => "e",
-		),
-		array(
-			'label'	=> t('Posted Order'),
+			'accesskey' => 'e',
+		],
+		[
+			'label'	=> L10n::t('Posted Order'),
 			'url'	=> str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
 			'sel'	=> $postord_active,
-			'title'	=> t('Sort by Post Date'),
+			'title'	=> L10n::t('Sort by Post Date'),
 			'id'	=> 'posted-order-tab',
-			'accesskey' => "t",
-		),
-	);
+			'accesskey' => 't',
+		],
+	];
 
-	if (Feature::isEnabled(local_user(),'personal_tab')) {
-		$tabs[] = array(
-			'label'	=> t('Personal'),
+	if (Feature::isEnabled(local_user(), 'personal_tab')) {
+		$tabs[] = [
+			'label'	=> L10n::t('Personal'),
 			'url'	=> str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
 			'sel'	=> $conv_active,
-			'title'	=> t('Posts that mention or involve you'),
+			'title'	=> L10n::t('Posts that mention or involve you'),
 			'id'	=> 'personal-tab',
-			'accesskey' => "r",
-		);
+			'accesskey' => 'r',
+		];
 	}
 
-	if (Feature::isEnabled(local_user(),'new_tab')) {
-		$tabs[] = array(
-			'label'	=> t('New'),
+	if (Feature::isEnabled(local_user(), 'new_tab')) {
+		$tabs[] = [
+			'label'	=> L10n::t('New'),
 			'url'	=> 'network/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
 			'sel'	=> $new_active,
-			'title'	=> t('Activity Stream - by date'),
+			'title'	=> L10n::t('Activity Stream - by date'),
 			'id'	=> 'activitiy-by-date-tab',
-			'accesskey' => "w",
-		);
+			'accesskey' => 'w',
+		];
 	}
 
-	if (Feature::isEnabled(local_user(),'link_tab')) {
-		$tabs[] = array(
-			'label'	=> t('Shared Links'),
+	if (Feature::isEnabled(local_user(), 'link_tab')) {
+		$tabs[] = [
+			'label'	=> L10n::t('Shared Links'),
 			'url'	=> str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
 			'sel'	=> $bookmarked_active,
-			'title'	=> t('Interesting Links'),
+			'title'	=> L10n::t('Interesting Links'),
 			'id'	=> 'shared-links-tab',
-			'accesskey' => "b",
-		);
+			'accesskey' => 'b',
+		];
 	}
 
-	if (Feature::isEnabled(local_user(),'star_posts')) {
-		$tabs[] = array(
-			'label'	=> t('Starred'),
+	if (Feature::isEnabled(local_user(), 'star_posts')) {
+		$tabs[] = [
+			'label'	=> L10n::t('Starred'),
 			'url'	=> str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
 			'sel'	=> $starred_active,
-			'title'	=> t('Favourite Posts'),
+			'title'	=> L10n::t('Favourite Posts'),
 			'id'	=> 'starred-posts-tab',
-			'accesskey' => "m",
-		);
+			'accesskey' => 'm',
+		];
 	}
 
 	// save selected tab, but only if not in file mode
-	if (!x($_GET,'file')) {
-		PConfig::set(local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active));
+	if (!x($_GET, 'file')) {
+		PConfig::set(local_user(), 'network.view', 'tab.selected', [
+			$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active
+		]);
 	}
 
-	$arr = array('tabs' => $tabs);
-	call_hooks('network_tabs', $arr);
+	$arr = ['tabs' => $tabs];
+	Addon::callHooks('network_tabs', $arr);
 
 	$tpl = get_markup_template('common_tabs.tpl');
 
-	return replace_macros($tpl, array('$tabs' => $arr['tabs']));
+	return replace_macros($tpl, ['$tabs' => $arr['tabs']]);
 
 	// --- end item filter tabs
 }