diff options
| author | Mario <mario@mariovavti.com> | 2018-06-17 17:00:17 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-06-17 17:00:17 +0200 |
| commit | 28043726e64f750e646b42aa6f649e277fc3767e (patch) | |
| tree | 18a41bea6a4805454e0b1a2dacdfeda451854690 /Zotlabs/Storage/Browser.php | |
| parent | 9c5df51141d68e50d3c1f5d3097160408debce48 (diff) | |
| parent | 7e736c5359732647f5203bf2bb7fcd50c448fad9 (diff) | |
| download | volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.gz volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.bz2 volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Storage/Browser.php')
| -rw-r--r-- | Zotlabs/Storage/Browser.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 153016da6..c2d70b854 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -333,6 +333,7 @@ class Browser extends DAV\Browser\Plugin { $aclselect = null; $lockstate = ''; + $limit = 0; if($this->auth->owner_id) { $channel = channelx_by_n($this->auth->owner_id); @@ -343,10 +344,15 @@ class Browser extends DAV\Browser\Plugin { $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($this->auth->owner_id, 'attach_upload_limit')); + } + + if((! $limit) && get_config('system','cloud_report_disksize')) { + $limit = engr_units_to_bytes(disk_free_space('store')); } - // 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')); $r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d", intval($this->auth->channel_account_id) ); |