aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-06 20:50:31 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-06 20:50:31 -0700
commit2312f03eacd973c18342e26087d279ea2bebd4a8 (patch)
tree102193a26c00f689ceed9b1b0772529366d48b2f /mod
parent1d09e4b6201a75e830c303746291ba75d94f937d (diff)
downloadvolse-hubzilla-2312f03eacd973c18342e26087d279ea2bebd4a8.tar.gz
volse-hubzilla-2312f03eacd973c18342e26087d279ea2bebd4a8.tar.bz2
volse-hubzilla-2312f03eacd973c18342e26087d279ea2bebd4a8.zip
Always open rpost editor on document ready
Diffstat (limited to 'mod')
-rw-r--r--mod/rpost.php15
1 files changed, 6 insertions, 9 deletions
diff --git a/mod/rpost.php b/mod/rpost.php
index 4a6b87cc6..d519a996b 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -94,15 +94,13 @@ function rpost_content(&$a) {
$channel = $a->get_channel();
- $channel_acl = array(
- 'allow_cid' => $channel['channel_allow_cid'],
- 'allow_gid' => $channel['channel_allow_gid'],
- 'deny_cid' => $channel['channel_deny_cid'],
- 'deny_gid' => $channel['channel_deny_gid']
- );
+
+ $acl = new AccessList($channel);
+
+ $channel_acl = $acl->get();
if($_REQUEST['url']) {
- $x = z_fetch_url(z_root() . '/urlinfo?f=&url=' . urlencode($_REQUEST['url']));
+ $x = z_fetch_url(z_root() . '/linkinfo?f=&url=' . urlencode($_REQUEST['url']));
if($x['success'])
$_REQUEST['body'] = $_REQUEST['body'] . $x['body'];
}
@@ -112,8 +110,7 @@ function rpost_content(&$a) {
'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
'default_location' => $channel['channel_location'],
'nickname' => $channel['channel_address'],
- 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
- || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+ 'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
'acl' => populate_acl($channel_acl),
'bang' => '',
'visitor' => true,