Code style

[friendica.git] / src / Module / Conversation / Network.php

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 046c6de8c3d6181cfc4d45fd220c7caccebd1545..3585d52ed2a0ae59b5a2a36ccbbaa5a5d1773326 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -139,22 +139,13 @@ class Network extends BaseModule
                        }
 
                        $x = [
-                               'is_owner' => true,
-                               'allow_location' => $a->user['allow_location'],
-                               'default_location' => $a->user['default-location'],
-                               'nickname' => $a->user['nickname'],
-                               'lockstate' => (self::$groupId || self::$forumContactId || self::$network || (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' => ACL::getDefaultUserPermissions($a->user),
-                               'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true, $default_permissions),
+                               'lockstate' => self::$groupId || self::$forumContactId || self::$network || ACL::getLockstateForUserId($a->getLoggedInUserId()) ? 'lock' : 'unlock',
+                               'acl' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), true, $default_permissions),
                                'bang' => ((self::$groupId || self::$forumContactId || self::$network) ? '!' : ''),
-                               'visitor' => 'block',
-                               'profile_uid' => local_user(),
                                'content' => $content,
                        ];
 
-                       $o .= status_editor($a, $x);
+                       $o .= DI::conversation()->statusEditor($x);
                }
 
                if (self::$groupId) {
@@ -187,7 +178,7 @@ class Network extends BaseModule
                        $ordering = '`commented`';
                }
 
-               $o .= conversation(DI::app(), $items, 'network', false, false, $ordering, local_user());
+               $o .= DI::conversation()->create($items, 'network', false, false, $ordering, local_user());
 
                if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
                        $o .= HTML::scrollLoader();