diff options
| author | hubzilla <git@macgirvin.com> | 2016-08-06 07:50:21 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-06 07:50:21 +1000 |
| commit | 1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53 (patch) | |
| tree | 95e9b493a6fd9b9370b230a11d59be73b9fcedd2 /include | |
| parent | 709206accde6136f96f1484510edc4b61b3d52a7 (diff) | |
| parent | 531baa8fc4c29c10afdf52fc88174b8b6fd69700 (diff) | |
| download | volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.tar.gz volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.tar.bz2 volse-hubzilla-1bff63bd2e5d1423034094ee9bfc59c2ddb2bd53.zip | |
Merge pull request #477 from git-marijus/dev
Some work to make multiple acl forms per page work
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 4 | ||||
| -rw-r--r-- | include/text.php | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 1efca37f3..6bcd968f4 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1253,6 +1253,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), diff --git a/include/text.php b/include/text.php index d508f8ab3..d283bb41f 100644 --- a/include/text.php +++ b/include/text.php @@ -2824,6 +2824,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 |