diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-06 20:50:31 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-06 20:50:31 -0700 |
| commit | 2312f03eacd973c18342e26087d279ea2bebd4a8 (patch) | |
| tree | 102193a26c00f689ceed9b1b0772529366d48b2f | |
| parent | 1d09e4b6201a75e830c303746291ba75d94f937d (diff) | |
| download | volse-hubzilla-2312f03eacd973c18342e26087d279ea2bebd4a8.tar.gz volse-hubzilla-2312f03eacd973c18342e26087d279ea2bebd4a8.tar.bz2 volse-hubzilla-2312f03eacd973c18342e26087d279ea2bebd4a8.zip | |
Always open rpost editor on document ready
| -rw-r--r-- | mod/rpost.php | 15 | ||||
| -rw-r--r-- | view/js/mod_rpost.js | 1 |
2 files changed, 7 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, diff --git a/view/js/mod_rpost.js b/view/js/mod_rpost.js new file mode 100644 index 000000000..06b67136b --- /dev/null +++ b/view/js/mod_rpost.js @@ -0,0 +1 @@ +$(document).ready(function() { initEditor(); }); |