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

multi acl: port /cloud and /filestorage

Browse Source
This commit is contained in:
Mario Vavti
2016-08-04 10:36:45 +02:00
parent 4ede3fd771
commit 0340160ba7
6 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Module/Filestorage.php
View File

@@ -141,7 +141,7 @@ class Filestorage extends \Zotlabs\Web\Controller {
// Encode path that is used for link so it's a valid URL
// Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly
$encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath));
$o = replace_macros(get_markup_template('attach_edit.tpl'), array(
'$header' => t('Edit file permissions'),
'$file' => $f,
@@ -151,6 +151,10 @@ class Filestorage extends \Zotlabs\Web\Controller {
'$channelnick' => $channel['channel_address'],
'$permissions' => t('Permissions'),
'$aclselect' => $aclselect_e,
'$allow_cid' => acl2json($f['allow_cid']),
'$allow_gid' => acl2json($f['allow_gid']),
'$deny_cid' => acl2json($f['deny_cid']),
'$deny_gid' => acl2json($f['deny_gid']),
'$lockstate' => $lockstate,
'$permset' => t('Set/edit permissions'),
'$recurse' => array('recurse', t('Include all files and sub folders'), 0, '', array(t('No'), t('Yes'))),
@@ -162,11 +166,6 @@ class Filestorage extends \Zotlabs\Web\Controller {
'$attach_btn_title' => t('Share this file'),
'$link_btn_title' => t('Show URL to this file'),
'$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes'))),
'$allow_cid' => json_encode(expand_acl($f['allow_cid'])),
'$allow_gid' => json_encode(expand_acl($f['allow_gid'])),
'$deny_cid' => json_encode(expand_acl($f['deny_cid'])),
'$deny_cid' => json_encode(expand_acl($f['deny_gid']))
));
echo $o;