hubzilla issue #896
This commit is contained in:
parent
b450b6a435
commit
e70bd0054c
@ -2,6 +2,7 @@
|
|||||||
namespace Zotlabs\Module;
|
namespace Zotlabs\Module;
|
||||||
|
|
||||||
require_once('include/conversation.php');
|
require_once('include/conversation.php');
|
||||||
|
require_once('include/acl_selectors.php');
|
||||||
|
|
||||||
|
|
||||||
class Pubstream extends \Zotlabs\Web\Controller {
|
class Pubstream extends \Zotlabs\Web\Controller {
|
||||||
@ -33,6 +34,47 @@ class Pubstream extends \Zotlabs\Web\Controller {
|
|||||||
$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
|
$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
|
||||||
$net = ((array_key_exists('net',$_REQUEST)) ? escape_tags($_REQUEST['net']) : '');
|
$net = ((array_key_exists('net',$_REQUEST)) ? escape_tags($_REQUEST['net']) : '');
|
||||||
|
|
||||||
|
|
||||||
|
if(local_channel() && (! $update)) {
|
||||||
|
|
||||||
|
$channel = \App::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']
|
||||||
|
);
|
||||||
|
|
||||||
|
$x = array(
|
||||||
|
'is_owner' => true,
|
||||||
|
'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
|
||||||
|
'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'),
|
||||||
|
|
||||||
|
'acl' => populate_acl($channel_acl),
|
||||||
|
'permissions' => $channel_acl,
|
||||||
|
'bang' => '',
|
||||||
|
'visitor' => true,
|
||||||
|
'profile_uid' => local_channel(),
|
||||||
|
'return_path' => 'channel/' . $channel['channel_address'],
|
||||||
|
'expanded' => true,
|
||||||
|
'editor_autocomplete' => true,
|
||||||
|
'bbco_autocomplete' => 'bbcode',
|
||||||
|
'bbcode' => true,
|
||||||
|
'jotnets' => true
|
||||||
|
);
|
||||||
|
|
||||||
|
$o = '<div id="jot-popup">';
|
||||||
|
$o .= status_editor($a,$x);
|
||||||
|
$o .= '</div>';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(! $update && !$load) {
|
if(! $update && !$load) {
|
||||||
|
|
||||||
|
3
view/css/mod_pubstream.css
Normal file
3
view/css/mod_pubstream.css
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#jot-popup {
|
||||||
|
display: none;
|
||||||
|
}
|
5
view/js/mod_pubstream.js
Normal file
5
view/js/mod_pubstream.js
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
$(document).ready(function() {
|
||||||
|
$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
|
||||||
|
// make auto-complete work in more places
|
||||||
|
$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
|
||||||
|
});
|
Reference in New Issue
Block a user