Merge branch '9.2RC'master

3 files changed, 11 insertions, 8 deletions

diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 912b4442d..e7f71c8c8 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -4,6 +4,7 @@ namespace Zotlabs\Storage;
 
 use Sabre\DAV;
 use App;
+use Zotlabs\Lib\Config;
 
 /**
  * @brief Provides a DAV frontend for the webbrowser.
@@ -101,7 +102,7 @@ class Browser extends DAV\Browser\Plugin {
 
 		$folder_list = attach_folder_select_list($channel_id);
 
-		$siteroot_disabled = get_config('system', 'cloud_disable_siteroot');
+		$siteroot_disabled = Config::Get('system', 'cloud_disable_siteroot');
 		$is_root_folder = (($path === 'cloud/' . $nick) ? true : false);
 
 		$parent_path = '';
@@ -210,7 +211,7 @@ class Browser extends DAV\Browser\Plugin {
 			// types
 
 			$photo_icon = '';
-			$preview_style = intval(get_config('system','thumbnail_security',0));
+			$preview_style = intval(Config::Get('system','thumbnail_security',0));
 
 			$is_creator = (($data['creator'] === get_observer_hash()) ? true : false);
 
@@ -474,7 +475,7 @@ class Browser extends DAV\Browser\Plugin {
 			$limit = engr_units_to_bytes(service_class_fetch($this->auth->owner_id, 'attach_upload_limit'));
 		}
 
-		if((! $limit) && get_config('system','cloud_report_disksize')) {
+		if((! $limit) && Config::Get('system','cloud_report_disksize')) {
 			$limit = engr_units_to_bytes(disk_free_space('store'));
 		}
 
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 333251f69..a68fdcf26 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -3,6 +3,7 @@
 namespace Zotlabs\Storage;
 
 use Sabre\DAV;
+use Zotlabs\Lib\Config;
 use Zotlabs\Lib\Libsync;
 
 /**
@@ -89,7 +90,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 		logger('children for ' . $this->ext_path, LOGGER_DATA);
 		$this->log();
 
-		if (get_config('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {
+		if (Config::Get('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {
 			throw new DAV\Exception\Forbidden('Permission denied.');
 		}
 
@@ -111,7 +112,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 	public function getChild($name) {
 		logger($name, LOGGER_DATA);
 
-		if (get_config('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {
+		if (Config::Get('system', 'block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {
 			throw new DAV\Exception\Forbidden('Permission denied.');
 		}
 
@@ -360,7 +361,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 			intval($c[0]['channel_id'])
 		);
 
-		$maxfilesize = get_config('system', 'maxfilesize');
+		$maxfilesize = Config::Get('system', 'maxfilesize');
 		if (($maxfilesize) && ($size > $maxfilesize)) {
 			attach_delete($c[0]['channel_id'], $hash);
 			return;
@@ -776,7 +777,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 	function ChannelList(&$auth) {
 		$ret = [];
 
-		if (intval(get_config('system','cloud_disable_siteroot'))) {
+		if (intval(Config::Get('system','cloud_disable_siteroot'))) {
 			return $ret;
 		}
 
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index ff379e2e9..642dd4515 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -3,6 +3,7 @@
 namespace Zotlabs\Storage;
 
 use Sabre\DAV;
+use Zotlabs\Lib\Config;
 use Zotlabs\Lib\Libsync;
 
 /**
@@ -240,7 +241,7 @@ class File extends DAV\Node implements DAV\IFile {
 		// There is an Exception "InsufficientStorage" or "PaymentRequired" for
 		// our service class from SabreDAV we could use.
 
-		$maxfilesize = get_config('system', 'maxfilesize');
+		$maxfilesize = Config::Get('system', 'maxfilesize');
 		if (($maxfilesize) && ($size > $maxfilesize)) {
 			attach_delete($c[0]['channel_id'], $this->data['hash']);
 			return;