Merge pull request #4798 from MrPetovan/bug/prevent-empty-uid-in-preloadconfigadapter

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 8cd2e279397ac4c43ae928cdcff5a74a3c0c6412..a35f0619beb9ecac212dc1255257175f048c1307 100644 (file)
--- 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 == '') {
@@ -778,10 +771,15 @@ function networkThreadedView(App $a, $update, $parent)
                        FROM `item` $sql_post_table
                        STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+                               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 {
@@ -790,10 +788,15 @@ function networkThreadedView(App $a, $update, $parent)
                        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())
                );
        }
@@ -834,9 +837,14 @@ function networkThreadedView(App $a, $update, $parent)
                                (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);