harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #450 from git-marijus/dev

Browse Source 
fix /cloud after recent changes
This commit is contained in:
hubzilla 2016-07-08 10:40:59 +10:00 committed by GitHub
commit 9f413ed174
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Zotlabs/Module/Cloud.php
View File

@ -23,7 +23,6 @@ require_once('vendor/autoload.php');
class Cloud extends \Zotlabs\Web\Controller { class Cloud extends \Zotlabs\Web\Controller {
function init() { function init() {
require_once('include/reddav.php');
if (! is_dir('store')) if (! is_dir('store'))
os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false); os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false);
@ -79,17 +78,6 @@ class Cloud extends \Zotlabs\Web\Controller {
$is_readable = false; $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 // provide a directory view for the cloud in Hubzilla
$browser = new \Zotlabs\Storage\Browser($auth); $browser = new \Zotlabs\Storage\Browser($auth);
$auth->setBrowserPlugin($browser); $auth->setBrowserPlugin($browser);

2
Zotlabs/Module/Dav.php
View File

@ -44,8 +44,6 @@ class Dav extends \Zotlabs\Web\Controller {
} }
} }
require_once('include/reddav.php');
if (! is_dir('store')) if (! is_dir('store'))
os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false); os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false);

2
Zotlabs/Storage/Directory.php
View File

@ -206,6 +206,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
throw new DAV\Exception\Forbidden('Permission denied.'); throw new DAV\Exception\Forbidden('Permission denied.');
} }
require_once('include/attach.php');
$mimetype = z_mime_content_type($name); $mimetype = z_mime_content_type($name);
$c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1", $c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1",