diff options
| author | Max Kostikov <max@kostikov.co> | 2020-12-19 22:02:51 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-12-19 22:02:51 +0100 |
| commit | 116fc4e00df8f0a232289bc3fce37f8fc16f1c9d (patch) | |
| tree | 0d1cc173d40f620626dff401333d7756975e8fc2 /Zotlabs/Module/Dav.php | |
| parent | 600dcdfc583ab671fc61ff957ad7fd1a3a0c547d (diff) | |
| parent | 57f6f54f29623972abc980b5e87c7933e32d1d3a (diff) | |
| download | volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.tar.gz volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.tar.bz2 volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!4
Diffstat (limited to 'Zotlabs/Module/Dav.php')
| -rw-r--r-- | Zotlabs/Module/Dav.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index adab25e45..949b89950 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -51,11 +51,12 @@ class Dav extends \Zotlabs\Web\Controller { if($sigblock) { $keyId = str_replace('acct:','',$sigblock['keyId']); if($keyId) { - $r = q("select * from hubloc where hubloc_addr = '%s' limit 1", + $r = q("select * from hubloc where hubloc_addr = '%s'", dbesc($keyId) ); if($r) { - $c = channelx_by_hash($r[0]['hubloc_hash']); + $r = Libzot::zot_record_preferred($r); + $c = channelx_by_hash($r['hubloc_hash']); if($c) { $a = q("select * from account where account_id = %d limit 1", intval($c['channel_account_id']) @@ -99,7 +100,7 @@ class Dav extends \Zotlabs\Web\Controller { $auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV'); - $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); + $rootDirectory = new \Zotlabs\Storage\Directory('/', [], $auth); // A SabreDAV server-object $server = new SDAV\Server($rootDirectory); |