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

revert using channel_hash for cdav until we figure out how to do so cleanly

Browse Source
This commit is contained in:
zotlabs 2017-07-03 21:20:22 -07:00
parent 48063fa5ef
commit d18427a522
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Module/Cdav.php
View File

@ -146,7 +146,7 @@ class Cdav extends \Zotlabs\Web\Controller {
return; return;
$channel = \App::get_channel(); $channel = \App::get_channel();
$principalUri = 'principals/' . $channel['channel_hash']; $principalUri = 'principals/' . $channel['channel_address'];
if(!cdav_principal($principalUri)) if(!cdav_principal($principalUri))
return; return;
@ -358,7 +358,7 @@ class Cdav extends \Zotlabs\Web\Controller {
$sharee = new \Sabre\DAV\Xml\Element\Sharee(); $sharee = new \Sabre\DAV\Xml\Element\Sharee();
$sharee->href = 'mailto:' . $sharee_arr['channel_hash']; $sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
$sharee->principal = 'principals/' . $sharee_arr['channel_address']; $sharee->principal = 'principals/' . $sharee_arr['channel_address'];
$sharee->access = intval($_REQUEST['access']); $sharee->access = intval($_REQUEST['access']);
$sharee->properties = ['{DAV:}displayname' => $channel['channel_name']]; $sharee->properties = ['{DAV:}displayname' => $channel['channel_name']];
@ -749,7 +749,7 @@ class Cdav extends \Zotlabs\Web\Controller {
return; return;
$channel = \App::get_channel(); $channel = \App::get_channel();
$principalUri = 'principals/' . $channel['channel_hash']; $principalUri = 'principals/' . $channel['channel_address'];
if(!cdav_principal($principalUri)) { if(!cdav_principal($principalUri)) {
@ -956,7 +956,7 @@ class Cdav extends \Zotlabs\Web\Controller {
$sharee = new \Sabre\DAV\Xml\Element\Sharee(); $sharee = new \Sabre\DAV\Xml\Element\Sharee();
$sharee->href = 'mailto:' . $sharee_arr['channel_hash']; $sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
$sharee->principal = 'principals/' . $sharee_arr['channel_address']; $sharee->principal = 'principals/' . $sharee_arr['channel_address'];
$sharee->access = 4; $sharee->access = 4;
$caldavBackend->updateInvites($id, [$sharee]); $caldavBackend->updateInvites($id, [$sharee]);
@ -1156,7 +1156,7 @@ class Cdav extends \Zotlabs\Web\Controller {
if(! $channel) if(! $channel)
return; return;
$uri = 'principals/' . $channel['channel_hash']; $uri = 'principals/' . $channel['channel_address'];
$r = q("select * from principals where uri = '%s' limit 1", $r = q("select * from principals where uri = '%s' limit 1",

2
Zotlabs/Widget/Cdav.php
View File

@ -11,7 +11,7 @@ class Cdav {
return; return;
$channel = \App::get_channel(); $channel = \App::get_channel();
$principalUri = 'principals/' . $channel['channel_hash']; $principalUri = 'principals/' . $channel['channel_address'];
if(!cdav_principal($principalUri)) if(!cdav_principal($principalUri))
return; return;