diff options
Diffstat (limited to 'Zotlabs/Storage')
| -rw-r--r-- | Zotlabs/Storage/BasicAuth.php | 9 | ||||
| -rw-r--r-- | Zotlabs/Storage/Browser.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Storage/File.php | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 0ff9fad13..ad2582bb2 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -188,13 +188,10 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { protected function check_module_access($channel_id) { if($channel_id && \App::$module === 'cdav') { - $x = get_pconfig($channel_id,'cdav','enabled'); - if(! $x) { - $this->module_disabled = true; - return false; - } + return true; } - return true; + $this->module_disabled = true; + return false; } /** diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 7162161ef..3af9fcab1 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -17,6 +17,7 @@ use Sabre\DAV; */ class Browser extends DAV\Browser\Plugin { + public $build_page = false; /** * @see set_writeable() * @see \\Sabre\\DAV\\Auth\\Backend\\BackendInterface @@ -243,6 +244,8 @@ class Browser extends DAV\Browser\Plugin { $a = false; + nav_set_selected(t('Files')); + \App::$page['content'] = $html; load_pdl(); @@ -257,7 +260,7 @@ class Browser extends DAV\Browser\Plugin { } } $this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'"); - construct_page(); + $this->build_page = true; } /** diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index 1475241ab..7a102134f 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -265,7 +265,7 @@ class File extends DAV\Node implements DAV\IFile { $f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x; else $f = $x; - return fopen($f, 'rb'); + return @fopen($f, 'rb'); } return dbunescbin($r[0]['content']); } |