diff options
| author | hubzilla <git@macgirvin.com> | 2016-07-08 10:40:59 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 10:40:59 +1000 |
| commit | 9f413ed17435b06806fb83ede640554008410ccb (patch) | |
| tree | a9acf78914b5be0d31c6b3ec6f35a47bafe6d8ac | |
| parent | 233cfc29d6e68f8a8453fab2ebb733ab35fa4b67 (diff) | |
| parent | 227320f6f01dec264de820863f971d3e92a486ff (diff) | |
| download | volse-hubzilla-9f413ed17435b06806fb83ede640554008410ccb.tar.gz volse-hubzilla-9f413ed17435b06806fb83ede640554008410ccb.tar.bz2 volse-hubzilla-9f413ed17435b06806fb83ede640554008410ccb.zip | |
Merge pull request #450 from git-marijus/dev
fix /cloud after recent changes
| -rw-r--r-- | Zotlabs/Module/Cloud.php | 12 | ||||
| -rw-r--r-- | Zotlabs/Module/Dav.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 833b1b493..9845c5658 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -23,7 +23,6 @@ require_once('vendor/autoload.php'); class Cloud extends \Zotlabs\Web\Controller { function init() { - require_once('include/reddav.php'); if (! is_dir('store')) os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false); @@ -79,17 +78,6 @@ class Cloud extends \Zotlabs\Web\Controller { $is_readable = false; - if($_SERVER['REQUEST_METHOD'] === 'GET') { - try { - $x = RedFileData('/' . \App::$cmd, $auth); - } - catch(\Exception $e) { - if($e instanceof Sabre\DAV\Exception\Forbidden) { - http_status_exit(401, 'Permission denied.'); - } - } - } - // provide a directory view for the cloud in Hubzilla $browser = new \Zotlabs\Storage\Browser($auth); $auth->setBrowserPlugin($browser); diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 6528e0271..9b4b576c8 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -44,8 +44,6 @@ class Dav extends \Zotlabs\Web\Controller { } } - require_once('include/reddav.php'); - if (! is_dir('store')) os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false); diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 7a2d9e68b..b524b3cab 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -206,6 +206,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { throw new DAV\Exception\Forbidden('Permission denied.'); } + require_once('include/attach.php'); + $mimetype = z_mime_content_type($name); $c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1", |