aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Storage
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-24 20:27:59 -0700
committerredmatrix <git@macgirvin.com>2016-07-24 20:27:59 -0700
commit271f85be3b36a4d4aac55a51cb7ff2580a95ce3e (patch)
tree183829f6d4dd31a5adf7538211db20e56fc8e5ed /Zotlabs/Storage
parentb5f2b4af354b8864a3dfa1756c52631625430c44 (diff)
downloadvolse-hubzilla-271f85be3b36a4d4aac55a51cb7ff2580a95ce3e.tar.gz
volse-hubzilla-271f85be3b36a4d4aac55a51cb7ff2580a95ce3e.tar.bz2
volse-hubzilla-271f85be3b36a4d4aac55a51cb7ff2580a95ce3e.zip
add acl selection to files upload via /cloud (still missing from directory creation)
Diffstat (limited to 'Zotlabs/Storage')
-rw-r--r--Zotlabs/Storage/Browser.php21
1 files changed, 20 insertions, 1 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index e719530b5..93c55bd4c 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -274,6 +274,22 @@ class Browser extends DAV\Browser\Plugin {
// SimpleCollection, we won't need to show the panel either.
if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
return;
+ require_once('include/acl_selectors.php');
+
+ $aclselect = null;
+ $lockstate = '';
+
+ if($this->auth-owner_id) {
+ $channel = channelx_by_n($this->auth->owner_id);
+ if($channel) {
+ $acl = new \Zotlabs\Access\AccessList($channel);
+ $channel_acl = $acl->get();
+ $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+
+ $aclselect = ((local_channel() == $this->auth->owner_id) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
+
+ }
+ }
// Storage and quota for the account (all channels of the owner of this directory)!
$limit = engr_units_to_bytes(service_class_fetch($owner, 'attach_upload_limit'));
@@ -293,7 +309,6 @@ class Browser extends DAV\Browser\Plugin {
userReadableSize($limit),
round($used / $limit, 1) * 100);
}
-
// prepare quota for template
$quota = array();
$quota['used'] = $used;
@@ -307,6 +322,10 @@ class Browser extends DAV\Browser\Plugin {
'$upload_header' => t('Upload file'),
'$upload_submit' => t('Upload'),
'$quota' => $quota,
+ '$channick' => $this->auth->owner_nick,
+ '$aclselect' => $aclselect,
+ '$lockstate' => $lockstate,
+ '$return_url' => \App::$cmd,
'$dragdroptext' => t('Drop files here to immediately upload')
));
}