aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-04 09:10:21 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-04 09:10:21 +0200
commit4ede3fd771ea997cffaa6abab29988a58daf892e (patch)
tree45c5e44b042536014bb072676b74b4180442e793 /Zotlabs
parent3783c1af3e750fbf880559fd6f2d69017d87b101 (diff)
downloadvolse-hubzilla-4ede3fd771ea997cffaa6abab29988a58daf892e.tar.gz
volse-hubzilla-4ede3fd771ea997cffaa6abab29988a58daf892e.tar.bz2
volse-hubzilla-4ede3fd771ea997cffaa6abab29988a58daf892e.zip
multi acl: port photos
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Photos.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 1eeab1461..6aeac7af7 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -668,6 +668,10 @@ class Photos extends \Zotlabs\Web\Controller {
'$selname' => $selname,
'$permissions' => t('Permissions'),
'$aclselect' => $aclselect,
+ '$allow_cid' => acl2json($channel_acl['allow_cid']),
+ '$allow_gid' => acl2json($channel_acl['allow_gid']),
+ '$deny_cid' => acl2json($channel_acl['deny_cid']),
+ '$deny_gid' => acl2json($channel_acl['deny_gid']),
'$lockstate' => $lockstate,
'$uploader' => $ret['addon_text'],
'$default' => (($ret['default_upload']) ? true : false),
@@ -1016,7 +1020,7 @@ class Photos extends \Zotlabs\Web\Controller {
// FIXME - remove this when we move to conversation module
$r = $r[0]['children'];
-
+
$edit = null;
if($can_post) {
$album_e = $ph[0]['album'];
@@ -1042,6 +1046,10 @@ class Photos extends \Zotlabs\Web\Controller {
'tag_label' => t('Add a Tag'),
'permissions' => t('Permissions'),
'aclselect' => $aclselect_e,
+ 'allow_cid' => acl2json($ph[0]['allow_cid']),
+ 'allow_gid' => acl2json($ph[0]['allow_gid']),
+ 'deny_cid' => acl2json($ph[0]['deny_cid']),
+ 'deny_gid' => acl2json($ph[0]['deny_gid']),
'lockstate' => $lockstate[0],
'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
'item_id' => ((count($linked_items)) ? $link_item['id'] : 0),