X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=4ab773bd324e93da16fd388fc9a0ebd5c5a7b56f;hb=a7c48f40b75535e37be6bfcf7802fd43167cdbe4;hp=8cd2e279397ac4c43ae928cdcff5a74a3c0c6412;hpb=90f91dcbd5d7e8fd1556d5fcd25ec4e64056a312;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 8cd2e27939..4ab773bd32 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')) {
@@ -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();
 		}
 	}
 
@@ -576,8 +576,8 @@ function networkThreadedView(App $a, $update, $parent)
 			'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, $parent)
 
 	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, $parent)
 				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, $parent)
 	// 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 == '') {