harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiple acl work

Browse Source
This commit is contained in:
Mario Vavti
2016-08-03 21:16:57 +02:00
parent d858bd9265
commit c50bfa07ca
11 changed files with 96 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/conversation.php
View File

@@ -1213,6 +1213,8 @@ function status_editor($a, $x, $popup = false) {
call_hooks('jot_tool', $jotplugins);
//print_r(acl2json($x['permissions']['allow_gid'])); killme();
$o .= replace_macros($tpl, array(
'$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string),
'$action' => z_root() . '/item',
@@ -1253,6 +1255,10 @@ function status_editor($a, $x, $popup = false) {
'$visitor' => $x['visitor'],
'$lockstate' => $x['lockstate'],
'$acl' => $x['acl'],
'$allow_cid' => acl2json($x['permissions']['allow_cid']),
'$allow_gid' => acl2json($x['permissions']['allow_gid']),
'$deny_cid' => acl2json($x['permissions']['deny_cid']),
'$deny_gid' => acl2json($x['permissions']['deny_gid']),
'$mimeselect' => $mimeselect,
'$layoutselect' => $layoutselect,
'$showacl' => ((array_key_exists('showacl', $x)) ? $x['showacl'] : true),

6
include/text.php
View File

@@ -2796,6 +2796,12 @@ function expand_acl($s) {
return $ret;
}
function acl2json($s) {
$s = expand_acl($s);
$s = json_encode($s);
return $s;
}
// When editing a webpage - a dropdown is needed to select a page layout
// On submit, the pdl_select value (which is the mid of an item with item_type = ITEM_TYPE_PDL) is stored in