diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-10-12 12:13:44 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-10-12 12:13:44 +0200 |
| commit | cf547be1d6900d12719a9372cbc1a5d433d31863 (patch) | |
| tree | 03a525cf40905adafc21b0c4146e467bad288437 /Zotlabs/Module/Network.php | |
| parent | 29617737ca2c03c800ebbe4701dc21cf9f25ce22 (diff) | |
| parent | 16da1a4e810889448eecbd13d68183a820bcebe2 (diff) | |
| download | volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.tar.gz volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.tar.bz2 volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.zip | |
Merge branch '1.14RC'
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 0128adc2c..4f831c050 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -61,6 +61,7 @@ class Network extends \Zotlabs\Web\Controller { $search = (($_GET['search']) ? $_GET['search'] : ''); if($search) { + $_GET['netsearch'] = escape_tags($search); if(strpos($search,'@') === 0) { $r = q("select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1", dbesc(substr($search,1)), @@ -138,7 +139,7 @@ class Network extends \Zotlabs\Web\Controller { if($_GET['pf'] === '1') $deftag = '@' . t('forum') . '+' . intval($cid) . '+'; else - $def_acl = array('allow_cid' => '<' . $r[0]['abook_xchan'] . '>'); + $def_acl = [ 'allow_cid' => '<' . $r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; } if(! $update) { @@ -159,7 +160,7 @@ class Network extends \Zotlabs\Web\Controller { 'allow_gid' => $channel['channel_allow_gid'], 'deny_cid' => $channel['channel_deny_cid'], 'deny_gid' => $channel['channel_deny_gid'] - ); + ); $private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false); @@ -176,7 +177,8 @@ class Network extends \Zotlabs\Web\Controller { 'profile_uid' => local_channel(), 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); if($deftag) $x['pretext'] = $deftag; |