diff options
| author | friendica <info@friendica.com> | 2013-01-31 23:56:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-31 23:56:46 -0800 |
| commit | 5ca88ca10a11a76237aa34d1d93ba3e878567767 (patch) | |
| tree | 01f0ed98ea409e8183469bf616c572cd9046cee7 /mod/network.php | |
| parent | 6b3d36c36d9a1c2da3e338ef7802c77b5fd82167 (diff) | |
| download | volse-hubzilla-5ca88ca10a11a76237aa34d1d93ba3e878567767.tar.gz volse-hubzilla-5ca88ca10a11a76237aa34d1d93ba3e878567767.tar.bz2 volse-hubzilla-5ca88ca10a11a76237aa34d1d93ba3e878567767.zip | |
debugging of file attachment api - somewhat functional but the attachment info structure in the item table needs to be re-done.
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mod/network.php b/mod/network.php index 91b4228c9..cca69dc52 100644 --- a/mod/network.php +++ b/mod/network.php @@ -400,11 +400,12 @@ function network_content(&$a, $update = 0, $load = false) { $x = array( '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'), - 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb), + 'allow_location' => $a->user['allow_location'], // FIXME + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), +// FIXME + 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $channel), $celeb), 'bang' => (($group || $cid) ? '!' : ''), 'visitor' => 'block', 'profile_uid' => local_user() |