From 0340160ba71f73ef3dab1141d75f30d85144cc44 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 4 Aug 2016 10:36:45 +0200 Subject: multi acl: port /cloud and /filestorage --- Zotlabs/Storage/Browser.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Zotlabs/Storage/Browser.php') 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') -- cgit v1.2.3 From 4f0b1386924b52da59d0a4eedaae689173fe21da Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 6 Aug 2016 12:46:10 +0200 Subject: bring back acl for cloud file uploads --- Zotlabs/Storage/Browser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Storage/Browser.php') diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 78b267bf8..7bae8f0ee 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -279,7 +279,7 @@ class Browser extends DAV\Browser\Plugin { $aclselect = null; $lockstate = ''; - if($this->auth-owner_id) { + if($this->auth->owner_id) { $channel = channelx_by_n($this->auth->owner_id); if($channel) { $acl = new \Zotlabs\Access\AccessList($channel); @@ -330,6 +330,7 @@ class Browser extends DAV\Browser\Plugin { '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$return_url' => \App::$cmd, + '$path' => str_replace('cloud/' . $this->auth->owner_nick . '/', '', $path), '$dragdroptext' => t('Drop files here to immediately upload') )); } -- cgit v1.2.3 From e1659b0725c275c2ba5f38a02a0f3fbcec145519 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 7 Aug 2016 16:21:51 -0700 Subject: fix cloud path --- Zotlabs/Storage/Browser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Storage/Browser.php') diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 7bae8f0ee..e72c4fb62 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -330,7 +330,7 @@ class Browser extends DAV\Browser\Plugin { '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$return_url' => \App::$cmd, - '$path' => str_replace('cloud/' . $this->auth->owner_nick . '/', '', $path), + '$path' => trim(str_replace('cloud/' . $this->auth->owner_nick, '', $path),'/'), '$dragdroptext' => t('Drop files here to immediately upload') )); } -- cgit v1.2.3