diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-04 10:36:45 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-04 10:36:45 +0200 |
| commit | 0340160ba71f73ef3dab1141d75f30d85144cc44 (patch) | |
| tree | bba09795fa6a6b7e240a7c32bb42025253699e94 /Zotlabs | |
| parent | 4ede3fd771ea997cffaa6abab29988a58daf892e (diff) | |
| download | volse-hubzilla-0340160ba71f73ef3dab1141d75f30d85144cc44.tar.gz volse-hubzilla-0340160ba71f73ef3dab1141d75f30d85144cc44.tar.bz2 volse-hubzilla-0340160ba71f73ef3dab1141d75f30d85144cc44.zip | |
multi acl: port /cloud and /filestorage
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Filestorage.php | 11 | ||||
| -rw-r--r-- | Zotlabs/Storage/Browser.php | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index c8ad147bb..a401f4822 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -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; diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 93c55bd4c..78b267bf8 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -324,6 +324,10 @@ class Browser extends DAV\Browser\Plugin { '$quota' => $quota, '$channick' => $this->auth->owner_nick, '$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, '$return_url' => \App::$cmd, '$dragdroptext' => t('Drop files here to immediately upload') |